Merge branch 'unstable' of github.com:antirez/redis into unstable

diff --git a/src/redis-trib.rb b/src/redis-trib.rb
index 5a0fe363acadcf40d3fe43d9484f9ab6c3f1f645..cd35587fe7779e41d6d38d2313f63539dd448b1c 100755 (executable)
--- a/src/redis-trib.rb
+++ b/src/redis-trib.rb
@@ -169,12 +169,17 @@ class RedisTrib
 end
 
 COMMANDS={
-    "create-cluster" => ["create_cluster", -2]
+    "create-cluster" => ["create_cluster", -2, "node1_addr node2_addr ..."]
 }
 
 # Sanity check
 if ARGV.length == 0
     puts "Usage: redis-trib <command> <arguments ...>"
+    puts
+    COMMANDS.each{|k,v|
+        puts "  #{k.ljust(20)} #{v[2]}"
+    }
+    puts
     exit 1
 end