diff options
author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
---|---|---|
committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-03 15:50:34 +0000 |
commit | 9d2ee1b26196efe855d298639561ca69fb96e2cc (patch) | |
tree | b8283238588ec106c680c074b9650b8b4d93496e /nova/utils.py | |
parent | 6797c5acc47fb5111ef821d6b074cb635692a9fb (diff) | |
parent | 90e8072df434621a364763f1c7cae0ac0159d630 (diff) | |
download | nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.tar.gz nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.tar.xz nova-9d2ee1b26196efe855d298639561ca69fb96e2cc.zip |
Remerged trunk, fixed a few conflicts.
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions