cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 14 Aug 2015 14:40:45 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/d0ba476c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0ba476c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0ba476c

Branch: refs/heads/trunk
Commit: d0ba476c896c79a8dbd1bf32fc9f7a2198c09524
Parents: 90bd5ca f8f6fd2
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Aug 14 10:40:25 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Aug 14 10:40:25 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../db/commitlog/AbstractCommitLogService.java  |  2 +-
 .../cassandra/db/commitlog/CommitLog.java       | 22 +++++++-----
 .../db/commitlog/CommitLogArchiver.java         | 38 +++++++++++++-------
 .../db/commitlog/CommitLogDescriptor.java       |  1 -
 .../db/commitlog/CommitLogReplayer.java         | 14 ++++----
 .../db/commitlog/CommitLogSegment.java          |  1 -
 .../db/commitlog/CommitLogSegmentManager.java   | 17 +++------
 .../db/commitlog/CommitLogStressTest.java       |  8 ++---
 .../unit/org/apache/cassandra/SchemaLoader.java |  2 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |  2 +-
 .../org/apache/cassandra/db/CommitLogTest.java  |  4 +--
 .../db/commitlog/CommitLogTestReplayer.java     | 10 +++---
 .../db/commitlog/CommitLogUpgradeTest.java      | 11 ++----
 14 files changed, 70 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0ba476c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c3d7b67,85eb223..4f7d896
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta1
+  * Fix race during construction of commit log (CASSANDRA-10049)
   * Add option to only purge repaired tombstones (CASSANDRA-6434)
   * Change authorization handling for MVs (CASSANDRA-9927)
   * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)


Mime
View raw message