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/89463a56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89463a56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89463a56 Branch: refs/heads/trunk Commit: 89463a567e29ef1c33708511fdfd7e5b72b2f1b3 Parents: e90c493 b48d0da Author: Benedict Elliott Smith <[email protected]> Authored: Wed Jul 2 23:43:00 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Jul 2 23:43:00 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/DefsTables.java | 17 +++++++++++------ src/java/org/apache/cassandra/db/Keyspace.java | 4 ++++ .../apache/cassandra/db/commitlog/CommitLog.java | 17 +++++++++-------- .../cassandra/db/commitlog/CommitLogSegment.java | 6 ++---- .../db/commitlog/CommitLogSegmentManager.java | 11 +++++++++-- .../apache/cassandra/utils/concurrent/OpOrder.java | 7 +++++++ 7 files changed, 44 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/Keyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/89463a56/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java ----------------------------------------------------------------------
