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/f03783be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f03783be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f03783be Branch: refs/heads/trunk Commit: f03783befa730ccb14ce6649788ae7e78992111c Parents: a1f331f 2dfcb22 Author: Marcus Eriksson <marc...@apache.org> Authored: Mon Aug 10 09:34:02 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Aug 10 09:34:02 2015 +0200 ---------------------------------------------------------------------- NEWS.txt | 4 +++- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 12 ++++++------ .../org/apache/cassandra/db/ColumnFamilyStoreMBean.java | 12 ++++++------ .../cassandra/db/compaction/CompactionsCQLTest.java | 11 +++++------ 4 files changed, 20 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
