You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/02/01 09:48:57 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bdcc059a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdcc059a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdcc059a
Branch: refs/heads/trunk
Commit: bdcc059a477fd17a90e5d48ac8256a8dc5798c1f
Parents: 8bc8fa3 b554cb3
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Feb 1 08:44:54 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Mon Feb 1 08:44:54 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdcc059a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9d58926,7a42916..394faaf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
-3.0.3
+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:
+ * Invalidate legacy schema tables when unloading them (CASSANDRA-11071)
* (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
(CASSANDRA-11003)
* Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)