You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by be...@apache.org on 2015/01/05 17:21:24 UTC

[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

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/ec15878e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec15878e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec15878e

Branch: refs/heads/trunk
Commit: ec15878ef1351be6fe00c581b74d398a8255a1c3
Parents: 1dcf66b c1374ae
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jan 5 16:21:03 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jan 5 16:21:03 2015 +0000

----------------------------------------------------------------------
 .../apache/cassandra/db/commitlog/CommitLogSegmentManager.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------