natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Jeff Jirsa 2017-08-10 18:13:45 -07:00
parent ed0243954f 1884dbe288
commit d68357a447
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -132,6 +132,7 @@ Merged from 3.0:
* Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
* Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
* Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)
* sstabledump reports incorrect usage for argument order (CASSANDRA-13532)
Merged from 2.2:
* Prevent integer overflow on exabyte filesystems (CASSANDRA-13067)
* Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223)

2
src/java/org/apache/cassandra/tools/SSTableExport.java
View File

@ -211,7 +211,7 @@ public class SSTableExport
private static void printUsage()
{
String usage = String.format("sstabledump <options> <sstable file path>%n");
String usage = String.format("sstabledump <sstable file path> <options>%n");
String header = "Dump contents of given SSTable to standard output in JSON format.";
new HelpFormatter().printHelp(usage, header, options, "");
}