Merge branch 'cassandra-1.2' into trunk

2013-01-14 09:45:07 -06:00 · 2013-01-14 09:45:07 -06:00 · ec361ab002
parent 7196abc397 ec21288db7
commit ec361ab002
1 changed files with 3 additions and 0 deletions
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@ -139,6 +139,9 @@ commands:
  - name: upgradesstables [keyspace] [cfnames]
    help: |
      Scrub (rebuild sstables for) one or more column families
+  - name: setcompactionthreshold <keyspace> <cfname>
+    help: |
+      Set min and max compaction thresholds for a given column family
  - name: getcompactionthreshold <keyspace> <cfname>
    help: |
      Print min and max compaction thresholds for a given column family