Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e50d89dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e50d89dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e50d89dd Branch: refs/heads/trunk Commit: e50d89dd2b4a87eae7eaa5639dc1852769af4460 Parents: 414ba40 a7a7ede Author: Jonathan Ellis <[email protected]> Authored: Sat Nov 16 11:11:03 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Sat Nov 16 11:11:03 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d89dd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e50d89dd/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
