Updated Branches: refs/heads/trunk ae87a1f13 -> abb94957f
Merge branch 'cassandra-1.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/abb94957 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abb94957 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abb94957 Branch: refs/heads/trunk Commit: abb94957f6b4f448d7c28cca76555fe047456dff Parents: ae87a1f 42ceccb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Feb 15 19:38:24 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Feb 15 19:38:24 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abb94957/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abb94957/src/java/org/apache/cassandra/db/compaction/CompactionController.java ----------------------------------------------------------------------
