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/d1af9792 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1af9792 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1af9792 Branch: refs/heads/trunk Commit: d1af9792711e2dc33f828947cf119bb38b28a40f Parents: f5c54aa 3aef07d Author: Jonathan Ellis <[email protected]> Authored: Sun May 25 07:23:52 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sun May 25 07:23:52 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/BatchlogManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
