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/b1ea0aa9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1ea0aa9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1ea0aa9 Branch: refs/heads/trunk Commit: b1ea0aa9e9eb32d32bcfb2b17fd12b9df1fd2aee Parents: 8e943b3 75c1851 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 22 08:33:19 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 22 08:33:19 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DefsTables.java | 2 ++ src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 7 +++++++ 2 files changed, 9 insertions(+) ----------------------------------------------------------------------
