cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 18 Dec 2015 23:39:55 GMT
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/7e473771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e473771
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e473771

Branch: refs/heads/trunk
Commit: 7e47377164949d23a468cf012736efb96f1e7dcc
Parents: 01b3508 d5326d4
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Dec 18 23:39:37 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Dec 18 23:39:37 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/7e473771/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0df24d5,d0f1613..bf2ca61
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,7 -7,12 +30,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:
+  * 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)


Mime
View raw message