You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/03/17 18:12:16 UTC
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.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/ceddff58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ceddff58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ceddff58
Branch: refs/heads/cassandra-2.1
Commit: ceddff58f316b2a04494918615d7240558e5c0d2
Parents: dd60ab4 98ed6a4
Author: Brandon Williams <br...@apache.org>
Authored: Mon Mar 17 12:08:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Mar 17 12:08:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 7 +++++++
conf/cassandra.yaml | 5 +++--
src/java/org/apache/cassandra/config/EncryptionOptions.java | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ceddff58/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca4bcfb,688a759..9682073
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -36,6 -11,14 +36,13 @@@ Merged from 2.0
* Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
* Fix CompactionManager.needsCleanup (CASSANDRA-6845)
* Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779)
+ * Read message id as string from earlier versions (CASSANDRA-6840)
+ * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837)
-Merged from 1.2:
+ * add extra SSL cipher suites (CASSANDRA-6613)
+ * fix nodetool getsstables for blob PK (CASSANDRA-6803)
+
+
+ 2.0.6
* Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
* Pool CqlRecordWriter clients by inetaddress rather than Range
(CASSANDRA-6665)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ceddff58/conf/cassandra.yaml
----------------------------------------------------------------------