Merge branch 'cassandra-2.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/3f146577 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f146577 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f146577 Branch: refs/heads/trunk Commit: 3f1465779de511ba2351bdf514e5dbab34e16e1b Parents: 0c34fa8 a1e594b Author: Jonathan Ellis <[email protected]> Authored: Tue Oct 15 23:43:25 2013 +0100 Committer: Jonathan Ellis <[email protected]> Committed: Tue Oct 15 23:43:25 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../db/commitlog/CommitLogAllocator.java | 34 +++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f146577/CHANGES.txt ----------------------------------------------------------------------
