~rconradharris/nova/uuid-redux

Viewing all changes in revision 1204.

  • Committer: Rick Harris
  • Date: 2011-06-20 14:58:00 UTC
  • mfrom: (1184.1.15 nova)
  • Revision ID: rick.harris@rackspace.com-20110620145800-x2wbw9lum96jxtss
Merging trunk, fixing conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: