summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-05-31 20:49:49 +0000
committerRick Harris <rick.harris@rackspace.com>2011-05-31 20:49:49 +0000
commitb4845fa52affacf76ae1668079f1cc7dfa1b4004 (patch)
tree09c5e661f15551ef6fe16bfd719a9fdb8b86895d /bin/stack
parent1b610e28e40c77271191349b6bfaa56c8f522c24 (diff)
parent3812bb4c7e6fcee4c87c1225d9c725db08527018 (diff)
downloadnova-b4845fa52affacf76ae1668079f1cc7dfa1b4004.tar.gz
nova-b4845fa52affacf76ae1668079f1cc7dfa1b4004.tar.xz
nova-b4845fa52affacf76ae1668079f1cc7dfa1b4004.zip
Resolving conflict and finish test_images
Diffstat (limited to 'bin/stack')
-rwxr-xr-xbin/stack2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/stack b/bin/stack
index d84a82e27..a1c6d1348 100755
--- a/bin/stack
+++ b/bin/stack
@@ -65,7 +65,7 @@ def format_help(d):
indent = MAX_INDENT - 6
out = []
- for k, v in d.iteritems():
+ for k, v in sorted(d.iteritems()):
if (len(k) + 6) > MAX_INDENT:
out.extend([' %s' % k])
initial_indent = ' ' * (indent + 6)