cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [4/4] cassandra git commit: Merge branch cassandra-3.5 into trunk
Date Wed, 16 Mar 2016 17:27:27 GMT
Merge branch cassandra-3.5 into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5394f19
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5394f19
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5394f19

Branch: refs/heads/trunk
Commit: e5394f192e882a5f23527041a9a93f82e80c0a49
Parents: 4ecd854 ee40e3b
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Wed Mar 16 18:26:48 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Wed Mar 16 18:26:57 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../db/commitlog/AbstractCommitLogService.java  |   1 +
 .../db/commitlog/CommitLogSegment.java          |  23 +++--
 .../db/commitlog/CommitLogSegmentManager.java   |  11 +-
 .../db/commitlog/CompressedSegment.java         |   4 +-
 .../db/commitlog/EncryptedSegment.java          |   4 +-
 .../db/commitlog/FileDirectSegment.java         |  42 ++++++--
 .../commitlog/CommitLogSegmentManagerTest.java  | 100 ++++++++++++++++++
 .../cassandra/db/commitlog/CommitLogTest.java   | 101 ++++++++++---------
 9 files changed, 220 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5394f19/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6897d61,ffd0b24..8eb0c1f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,6 +1,16 @@@
 +3.6
 + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099)
 + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274)
 + * Refuse to start and print txn log information in case of disk
 +   corruption (CASSANDRA-10112)
 + * Resolve some eclipse-warnings (CASSANDRA-11086)
 + * (cqlsh) Show static columns in a different color (CASSANDRA-11059)
 + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
 +
 +
  3.5
  Merged from 3.0:
+  * Add backpressure to compressed or encrypted commit log (CASSANDRA-10971)
   * SSTableExport supports secondary index tables (CASSANDRA-11330)
   * Fix sstabledump to include missing info in debug output (CASSANDRA-11321)
   * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331)


Mime
View raw message