diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-07-08 15:36:18 +0900 |
|---|---|---|
| committer | Isaku Yamahata <yamahata@valinux.co.jp> | 2011-07-08 15:36:18 +0900 |
| commit | 4f973269e84adb10ac3959ef255ecc60cc90620e (patch) | |
| tree | c4a817bd3341610246a7d3157b78eb0a35256f2a /bin/stack | |
| parent | 8c8e92b2662a3ab9aa2fd71bef48d95408ebb89b (diff) | |
| download | nova-4f973269e84adb10ac3959ef255ecc60cc90620e.tar.gz nova-4f973269e84adb10ac3959ef255ecc60cc90620e.tar.xz nova-4f973269e84adb10ac3959ef255ecc60cc90620e.zip | |
nova/compute/api.py: fixed mismerge
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions