summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorMonsyne Dragon <mdragon@rackspace.com>2011-03-03 15:50:34 +0000
committerMonsyne Dragon <mdragon@rackspace.com>2011-03-03 15:50:34 +0000
commit9d2ee1b26196efe855d298639561ca69fb96e2cc (patch)
treeb8283238588ec106c680c074b9650b8b4d93496e /nova/utils.py
parent6797c5acc47fb5111ef821d6b074cb635692a9fb (diff)
parent90e8072df434621a364763f1c7cae0ac0159d630 (diff)
downloadnova-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