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/5c50d317 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c50d317 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c50d317 Branch: refs/heads/trunk Commit: 5c50d317afcc7641009fbf689417418366f16ea1 Parents: 79e3217 f644656 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 13:16:48 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 13:16:48 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Schema.java | 7 +- .../db/commitlog/CommitLogSegment.java | 13 +- .../apache/cassandra/utils/ConcurrentBiMap.java | 131 +++++++++++++++++++ 4 files changed, 143 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c50d317/CHANGES.txt ----------------------------------------------------------------------
