Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3120b8b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3120b8b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3120b8b6 Branch: refs/heads/trunk Commit: 3120b8b656392505d2352e235c9e647684b69cf9 Parents: e1cb9b4 a2088b1 Author: Yuki Morishita <[email protected]> Authored: Tue Dec 22 14:29:56 2015 -0600 Committer: Yuki Morishita <[email protected]> Committed: Tue Dec 22 14:29:56 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/3120b8b6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 84e1cb8,be39f29..3b7f389 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -32,7 -9,12 +32,8 @@@ Merged from 2.2 * (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)
