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:28 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62de5a36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62de5a36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62de5a36
Branch: refs/heads/trunk
Commit: 62de5a36f17e02c8c0865cc9a6992cc63b58f23c
Parents: 82d5f6a a9a2d75
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Dec 2 13:52:00 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Dec 2 13:52:00 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/62de5a36/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7c4eb1,a82dcfc..ad4cd8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.1
+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)