You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/12/02 20:52:30 UTC
[6/6] 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/461fffc7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/461fffc7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/461fffc7
Branch: refs/heads/trunk
Commit: 461fffc764c1a2363b92ba3084fca8543440b0ae
Parents: b524020 62de5a3
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Dec 2 13:52:08 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Dec 2 13:52:08 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/StreamReader.java | 4 +---
.../cassandra/streaming/compress/CompressedStreamReader.java | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/461fffc7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc79512,ad4cd8b..a4c12a2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,6 +1,20 @@@
+3.2
+ * Normalize all scripts (CASSANDRA-10679)
+ * Make compression ratio much more accurate (CASSANDRA-10225)
+ * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
+ * Make index building pluggable (CASSANDRA-10681)
+ * Add sstable flush observer (CASSANDRA-10678)
+ * Improve NTS endpoints calculation (CASSANDRA-10200)
+ * Improve performance of the folderSize function (CASSANDRA-10677)
+ * Add support for type casting in selection clause (CASSANDRA-10310)
+ * 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 3.0:
+ * Fix NPE on stream read error (CASSANDRA-10771)
* Normalize cqlsh DESC output (CASSANDRA-10431)
* Rejects partition range deletions when columns are specified (CASSANDRA-10739)
* Fix error when saving cached key for old format sstable (CASSANDRA-10778)