You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2017/03/23 20:01:26 UTC
[08/11] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63116227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63116227
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63116227
Branch: refs/heads/cassandra-3.0
Commit: 631162271c9bbaca6b48dc4e2223dbba97bf51d4
Parents: f53e502 5978f9d
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Thu Mar 23 20:49:05 2017 +0100
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Thu Mar 23 20:50:13 2017 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/org/apache/cassandra/stress/settings/SettingsTransport.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/63116227/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4ee5814,a415395..2c5573a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-2.2.10
+3.0.13
+ * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
+ * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
+ * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics residing in MBeans (CASSANDRA-13216)
+ * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
+ * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
+ * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
+Merged from 2.2:
+ * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
* Wrong logger name in AnticompactionTask (CASSANDRA-13343)