Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a48ebbcf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a48ebbcf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a48ebbcf Branch: refs/heads/trunk Commit: a48ebbcf06162fb90448e1eefd8a58dbf4d807e2 Parents: a83aeba 2931a19 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Oct 13 15:09:14 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Oct 13 15:09:14 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 7 ++++- .../cassandra/db/ColumnFamilyMetricTest.java | 29 ++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a48ebbcf/CHANGES.txt ----------------------------------------------------------------------
