Merge pull request ceph#8688 from xiexingguo/xxg-wip-crushtooltip

tools/crushtool: add straw2 support for help message Reviewed-by: Sage Weil <[email protected]>
aderumier · Apr 24, 2016 · 1e1d898 · 1e1d898
2 parents e440998 + 6448ea2
commit 1e1d898
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
@@ -26,7 +26,7 @@
                            compile with unsafe tunables
      --build --num_osds N layer1 ...
                            build a new map, where each 'layer' is
-                           'name (uniform|straw|list|tree) size'
+                           'name (uniform|straw2|straw|list|tree) size'
 
   Options for the tunables adjustments stage
 

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
@@ -132,7 +132,7 @@ void usage()
   cout << "                         compile with unsafe tunables\n";
   cout << "   --build --num_osds N layer1 ...\n";
   cout << "                         build a new map, where each 'layer' is\n";
-  cout << "                         'name (uniform|straw|list|tree) size'\n";
+  cout << "                         'name (uniform|straw2|straw|list|tree) size'\n";
   cout << "\n";
   cout << "Options for the tunables adjustments stage\n";
   cout << "\n";