Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7829a0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7829a0a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7829a0a Branch: refs/heads/trunk Commit: c7829a0a65e74420b02e907c9c6b40cb758c566b Parents: 41f5d22 8bc8fa3 Author: Marcus Eriksson <[email protected]> Authored: Fri Jan 29 22:04:52 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jan 29 22:04:52 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/dht/Splitter.java | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7829a0a/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2584d45,9d58926..9f54f72 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,20 @@@ +3.4 + * Set javac encoding to utf-8 (CASSANDRA-11077) + * Integrate SASI index into Cassandra (CASSANDRA-10661) + * Add --skip-flush option to nodetool snapshot + * Skip values for non-queried columns (CASSANDRA-10657) + * Add support for secondary indexes on static columns (CASSANDRA-8103) + * CommitLogUpgradeTestMaker creates broken commit logs (CASSANDRA-11051) + * Add metric for number of dropped mutations (CASSANDRA-10866) + * Simplify row cache invalidation code (CASSANDRA-10396) + * Support user-defined compaction through nodetool (CASSANDRA-10660) + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981) + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953) + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838) + 3.3 + * Avoid infinite loop if owned range is smaller than number of + data dirs (CASSANDRA-11034) * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) Merged from 3.0: * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
