You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/04/01 03:26:29 UTC

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

Branch: refs/heads/trunk
Commit: 3b14239459f2561b49abf2044fd874c939a9b0ff
Parents: 93bd9ec e5639f4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Apr 1 04:26:04 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Apr 1 04:26:04 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                | 2 ++
 doc/native_protocol_v2.spec                                | 1 +
 src/java/org/apache/cassandra/db/BatchlogManager.java      | 2 +-
 test/unit/org/apache/cassandra/db/BatchlogManagerTest.java | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b142394/CHANGES.txt
----------------------------------------------------------------------