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/b92c55e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b92c55e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b92c55e6 Branch: refs/heads/trunk Commit: b92c55e68c005fe5581b50f585d9bc47dbdfaedb Parents: cb871ba e02341b Author: Marcus Eriksson <marc...@spotify.com> Authored: Wed Nov 13 20:16:59 2013 +0100 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Wed Nov 13 20:16:59 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92c55e6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b92c55e6/src/java/org/apache/cassandra/db/compaction/CompactionController.java ----------------------------------------------------------------------
