Updated Branches: refs/heads/cassandra-1.2 6487bc50b -> 374524b5b refs/heads/trunk 69540e025 -> 1f337b6e5
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f337b6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f337b6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f337b6e Branch: refs/heads/trunk Commit: 1f337b6e53ac29ff16f76dd2da4e73db50f8da7e Parents: 69540e0 374524b Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jan 11 17:47:35 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jan 11 17:47:35 2013 -0600 ---------------------------------------------------------------------- .../apache/cassandra/db/commitlog/CommitLog.java | 18 ++++++++++----- .../cassandra/db/commitlog/CommitLogReplayer.java | 15 +++++------ .../org/apache/cassandra/utils/IntervalTree.java | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f337b6e/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java ----------------------------------------------------------------------
