You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2016/03/02 14:11:14 UTC
[8/9] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57cbda0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57cbda0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57cbda0a
Branch: refs/heads/trunk
Commit: 57cbda0a411ec801c1532b6711506dec79917c8c
Parents: 70649a8 841a803
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Mar 2 14:08:57 2016 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Mar 2 14:08:57 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java | 69 ++++++++++++--------
2 files changed, 42 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57cbda0a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 26c3166,425cc58..5d010c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,7 -21,7 +52,8 @@@ Merged from 3.0
properly (CASSANDRA-11050)
* Fix NPE when using forceRepairRangeAsync without DC (CASSANDRA-11239)
Merged from 2.2:
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
* Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
* Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
* Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57cbda0a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------