Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e981973 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e981973 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e981973 Branch: refs/heads/trunk Commit: 0e98197330b61473530c07342a800c92bb974559 Parents: ee5aec2 289ad77 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jan 19 09:07:23 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 19 09:07:23 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e981973/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e981973/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
