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/8c9d2438 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c9d2438 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c9d2438 Branch: refs/heads/trunk Commit: 8c9d243803241d1cd880742cfb3aa1759c26f2fc Parents: 1e81923 43d248f Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jun 18 12:58:00 2014 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jun 18 12:58:00 2014 -0700 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/BatchlogManagerTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
