cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Wed, 04 Nov 2015 13:13:44 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/81e1b15d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81e1b15d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81e1b15d

Branch: refs/heads/trunk
Commit: 81e1b15dbd25b6ef8d23ff3b4aba573f4e9efd1a
Parents: b14423c 1492be0
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 4 13:13:32 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 4 13:13:32 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/batchlog/BatchlogManager.java     |  8 +++-
 .../cassandra/batchlog/BatchlogManagerTest.java | 40 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/81e1b15d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6b5984b,61cc92e..1ae41a0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
   * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608)
   * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068)
   * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)


Mime
View raw message