Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f81d5ddc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f81d5ddc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f81d5ddc Branch: refs/heads/trunk Commit: f81d5ddc630c8fe5b4e412412d3ec0f1fa3bb923 Parents: 1def02f 2d76d9f Author: Aleksey Yeschenko <[email protected]> Authored: Wed Jun 4 18:02:47 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Wed Jun 4 18:02:47 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++++ src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java | 4 ++++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f81d5ddc/CHANGES.txt ----------------------------------------------------------------------
