diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-03-03 13:13:15 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-03-03 13:13:15 -0600 |
| commit | 05ab132a80877f6600ab3a1d712450e421db5eec (patch) | |
| tree | d1b065ed0325651a9150dc45b6a31693cd734693 /nova/utils.py | |
| parent | 953fe68ce9b27322003200c464c121464761d1e2 (diff) | |
| parent | 458bf9682df0514a7f180f1ab1566bb7846cd281 (diff) | |
| download | nova-05ab132a80877f6600ab3a1d712450e421db5eec.tar.gz nova-05ab132a80877f6600ab3a1d712450e421db5eec.tar.xz nova-05ab132a80877f6600ab3a1d712450e421db5eec.zip | |
Merge from trunk, conflict resolution and merge prop fixes
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions