You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/10 14:47:52 UTC
[7/7] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41c69ac5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41c69ac5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41c69ac5
Branch: refs/heads/trunk
Commit: 41c69ac556606c9bb8477d58a5094468d3829d47
Parents: 27f47b7 e8ee9ed
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Nov 10 13:47:27 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Nov 10 13:47:27 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../cassandra/io/sstable/CQLSSTableWriter.java | 2 ++
.../io/sstable/CQLSSTableWriterTest.java | 22 ++++++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/41c69ac5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7efdf5e,268ad08..dc912f1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
+3.2
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.1
Merged from 2.1:
+ * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
* Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)