Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1884dbe2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1884dbe2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1884dbe2 Branch: refs/heads/cassandra-3.11 Commit: 1884dbe288bf53af9359e4e1ad9e1cfc0d212f0c Parents: e018bec fab3845 Author: Jeff Jirsa <jji...@apple.com> Authored: Thu Aug 10 18:12:49 2017 -0700 Committer: Jeff Jirsa <jji...@apple.com> Committed: Thu Aug 10 18:13:24 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/SSTableExport.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1884dbe2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3308287,2e9e8ad..c672675 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,9 -14,11 +18,10 @@@ Merged from 3.0 * Make concat work with iterators that have different subsets of columns (CASSANDRA-13482) * Set test.runners based on cores and memory size (CASSANDRA-13078) * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557) - * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606) * 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: +Merged from 2.2: * Prevent integer overflow on exabyte filesystems (CASSANDRA-13067) * Fix queries with LIMIT and filtering on clustering columns (CASSANDRA-11223) * Fix potential NPE when resume bootstrap fails (CASSANDRA-13272) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1884dbe2/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
