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/c26b3971 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c26b3971 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c26b3971 Branch: refs/heads/cassandra-2.2 Commit: c26b3971622f55589f4f080516c9e01311b4e7b1 Parents: bcd68b5 3740f81 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 18 23:38:40 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 18 23:38:40 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26b3971/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 88ef42e,581784e..1ff1a5c --- 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: + * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593) * (cqlsh) further optimise COPY FROM (CASSANDRA-9302) * Allow CREATE TABLE WITH ID (CASSANDRA-9179) * Make Stress compiles within eclipse (CASSANDRA-10807) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26b3971/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ----------------------------------------------------------------------
