summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-06-16 22:17:54 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-06-16 22:17:54 +0900
commit7bc76ef403507f6762f782ff4d305cf2718346d5 (patch)
tree59987063fd7d46925dc4987da9f8e817dcf1efc9 /bin/stack
parent8da93c0352996ec733f3678b9ca02b72a96498c2 (diff)
downloadnova-7bc76ef403507f6762f782ff4d305cf2718346d5.tar.gz
nova-7bc76ef403507f6762f782ff4d305cf2718346d5.tar.xz
nova-7bc76ef403507f6762f782ff4d305cf2718346d5.zip
ec2/cloud.py: fix mismerge
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions