cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 22 Dec 2015 20:30:25 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae8baa49
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae8baa49
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae8baa49

Branch: refs/heads/cassandra-3.0
Commit: ae8baa499cc628cae7bbfa24e679cfe9aa9b42e3
Parents: e654c1b 7c3966b
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Dec 22 14:29:42 2015 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Dec 22 14:29:42 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/streaming/StreamSession.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1ff1a5c,82176c5..fb0b151
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.1.13
 +2.2.5
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae8baa49/src/java/org/apache/cassandra/streaming/StreamSession.java
----------------------------------------------------------------------


Mime
View raw message