Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54c6e66a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54c6e66a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54c6e66a Branch: refs/heads/cassandra-2.1 Commit: 54c6e66a8d6f01945dbe05ed518e86277a4967f8 Parents: d61443e c7834d3 Author: Jake Luciani <j...@apache.org> Authored: Tue Aug 12 10:01:30 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Tue Aug 12 10:01:30 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 23 +++++++++++---- .../org/apache/cassandra/db/CommitLogTest.java | 30 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/54c6e66a/CHANGES.txt ----------------------------------------------------------------------
