Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73d517d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73d517d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73d517d6 Branch: refs/heads/trunk Commit: 73d517d6dfbec9e1ed0813e6a1f1989d53b102f5 Parents: 8e7ed61 ef4a07b Author: Yuki Morishita <[email protected]> Authored: Fri Jun 27 12:14:31 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Jun 27 12:14:31 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java | 28 ++++++++++++++++- .../org/apache/cassandra/repair/Validator.java | 32 +++++++------------- .../apache/cassandra/repair/ValidatorTest.java | 10 +++--- .../cassandra/service/SerializationsTest.java | 11 ++++--- 5 files changed, 51 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/73d517d6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/73d517d6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/73d517d6/test/unit/org/apache/cassandra/repair/ValidatorTest.java ----------------------------------------------------------------------
