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/5d2ac2a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d2ac2a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d2ac2a9 Branch: refs/heads/trunk Commit: 5d2ac2a95113249f31cbbf39da08050817a7d596 Parents: 2eae436 55ce317 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Aug 13 10:33:50 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Aug 13 10:33:50 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d2ac2a9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d2ac2a9/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
