diff options
author | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-08 18:29:37 +0000 |
---|---|---|
committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-03-08 18:29:37 +0000 |
commit | d2683e69d1ead8630d1f79d810c5b77960ab30af (patch) | |
tree | 7232e360ba5d1372c3dba556acd310ce3afdf3b4 /nova/utils.py | |
parent | cbc2956a4e863c1bc952c7cef6045c39d293818d (diff) | |
parent | b238805d2ee9c19d3fb9b4dc43fa404630bdfaab (diff) | |
download | nova-d2683e69d1ead8630d1f79d810c5b77960ab30af.tar.gz nova-d2683e69d1ead8630d1f79d810c5b77960ab30af.tar.xz nova-d2683e69d1ead8630d1f79d810c5b77960ab30af.zip |
Remerged trunk. fixed conflict
Diffstat (limited to 'nova/utils.py')
0 files changed, 0 insertions, 0 deletions