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/cabf0fa3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cabf0fa3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cabf0fa3 Branch: refs/heads/trunk Commit: cabf0fa32a514f552c2f49641b0dd200be667a97 Parents: 3634eab fa70e06 Author: Marcus Eriksson <marc...@spotify.com> Authored: Fri Sep 13 09:18:40 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Fri Sep 13 09:18:40 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabf0fa3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cabf0fa3/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ----------------------------------------------------------------------
