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/1753f374 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1753f374 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1753f374 Branch: refs/heads/trunk Commit: 1753f3749a36d38a7bad2bd25c5eb67d9d6029a5 Parents: 70360cf af80201 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu May 8 08:19:35 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu May 8 08:19:35 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/AbstractCompactionStrategy.java | 16 +++++++++------- .../apache/cassandra/service/CassandraDaemon.java | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1753f374/CHANGES.txt ----------------------------------------------------------------------
