cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Fri, 13 Nov 2015 21:37:11 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/b3231e96
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3231e96
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3231e96

Branch: refs/heads/cassandra-3.1
Commit: b3231e963c811fc7f9a049af356f30ad67853e4a
Parents: 00c31a2 c2320c9
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Fri Nov 13 15:36:58 2015 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Fri Nov 13 15:36:58 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../cassandra/index/SecondaryIndexManager.java  |  6 ++-
 .../validation/entities/SecondaryIndexTest.java | 55 ++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3231e96/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6aff321,8bb67e1..9708859
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,7 @@@
 -3.0.1
 +3.1
 +Merged from 3.0:
+  * Correctly preserve deletion info on updated rows when notifying indexers
+    of single-row deletions (CASSANDRA-10694)
   * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
   * Keep the file open in trySkipCache (CASSANDRA-10669)
   * Updated trigger example (CASSANDRA-10257)


Mime
View raw message