Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ead0662c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead0662c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead0662c Branch: refs/heads/trunk Commit: ead0662c2cab75a55b686272b6eec1aae237eb82 Parents: 4e3d049 cfe51fb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Dec 20 10:08:21 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Dec 20 10:08:21 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/ead0662c/CHANGES.txt ----------------------------------------------------------------------
