Merge branch 'cassandra-2.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/45c70154 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45c70154 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45c70154 Branch: refs/heads/trunk Commit: 45c70154c668315b0f007e21d01d7b713082698c Parents: 9d4f7c9 79b3626 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Feb 4 20:18:33 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Feb 4 20:18:33 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45c70154/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45c70154/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
