~rackspace-titan/nova/image-service-cleanup

Viewing all changes in revision 1534.

  • Committer: Brian Waldon
  • Date: 2011-09-12 21:52:29 UTC
  • mfrom: (1517.1.41 nova)
  • Revision ID: brian.waldon@rackspace.com-20110912215229-5xab1wvvd11rft6g
merging trunk; resolving conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: