Merge branch 'cassandra-3.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/4f51341b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f51341b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f51341b Branch: refs/heads/trunk Commit: 4f51341b5695f718dc6b0a66ee264664a1d66094 Parents: 448e276 5285000 Author: Marcus Eriksson <[email protected]> Authored: Fri Aug 7 08:26:32 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Aug 7 08:26:32 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
