You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/01/14 15:50:25 UTC
[2/2] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
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/efc7d1b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efc7d1b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efc7d1b9
Branch: refs/heads/trunk
Commit: efc7d1b9ad7b0c6e79f4c4b2c60826fa0017d08c
Parents: 512a2fa e1938e2
Author: T Jake Luciani <ja...@apache.org>
Authored: Thu Jan 14 09:50:12 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Thu Jan 14 09:50:12 2016 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/efc7d1b9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b59f182,bf873fc..e7ff168
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
+3.4
+ * 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 bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
Merged from 3.0:
* Ensure stale index entries are purged during reads (CASSANDRA-11013)
* (cqlsh) Also apply --connect-timeout to control connection