Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95469455 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95469455 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95469455 Branch: refs/heads/trunk Commit: 95469455ed96de8f5b2984e434955de26e28441f Parents: 8825dee efc57cd Author: Marcus Eriksson <[email protected]> Authored: Mon May 18 06:45:53 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon May 18 06:45:53 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95469455/CHANGES.txt ----------------------------------------------------------------------
