cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Fri, 04 Dec 2015 20:53:58 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee46dfbf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee46dfbf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee46dfbf

Branch: refs/heads/cassandra-3.1
Commit: ee46dfbf934fc91d8d4865bef174b68174790edd
Parents: 2b8cdc2 c184e8c
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Dec 4 15:53:44 2015 -0500
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Dec 4 15:53:44 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/db/view/ViewUtils.java | 25 ++------
 .../apache/cassandra/service/StorageProxy.java  | 67 ++++++++++++--------
 .../apache/cassandra/db/view/ViewUtilsTest.java | 42 ++++++++++--
 4 files changed, 88 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee46dfbf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e06653f,b95aa76..a2e9434
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Avoid MV race during node decommission (CASSANDRA-10674)
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Handle single-column deletions correction in materialized views
     when the column is part of the view primary key (CASSANDRA-10796)


Mime
View raw message