Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d508f7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d508f7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d508f7f Branch: refs/heads/trunk Commit: 1d508f7f66a31d7a3d0ccf31b977fa6224170bc4 Parents: 4619628 88f9c92 Author: Benedict Elliott Smith <[email protected]> Authored: Mon Jul 14 20:12:18 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Jul 14 20:12:18 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Keyspace.java | 8 +--- src/java/org/apache/cassandra/db/Memtable.java | 2 - .../cassandra/db/commitlog/CommitLog.java | 12 +----- .../db/commitlog/CommitLogSegment.java | 41 ++++++++++---------- .../db/commitlog/CommitLogSegmentManager.java | 5 ++- 5 files changed, 27 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d508f7f/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d508f7f/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d508f7f/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
