Updated Branches: refs/heads/trunk dd14505f1 -> 38a1e7e92
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/38a1e7e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38a1e7e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38a1e7e9 Branch: refs/heads/trunk Commit: 38a1e7e923ae82c8e0c38c40c2eaeef92d41d482 Parents: dd14505 ead0662 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Dec 20 10:08:35 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Dec 20 10:08:35 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/CompactionManager.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a1e7e9/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38a1e7e9/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ----------------------------------------------------------------------
