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/3916e486 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3916e486 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3916e486 Branch: refs/heads/trunk Commit: 3916e48674c75af6f03f8ff762c8d6e00342dab8 Parents: 65a7088 587657d Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 2 16:07:24 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 2 16:07:24 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3916e486/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3916e486/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
