Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85176356 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85176356 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85176356 Branch: refs/heads/trunk Commit: 85176356673b76f2364dee9be40fd4a87802f856 Parents: 2445ea7 476b68a Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jan 19 09:05:56 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 19 09:05:56 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/85176356/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85176356/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
