cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/4] git commit: merge from 1.1
Date Wed, 05 Sep 2012 20:11:09 GMT
Updated Branches:
  refs/heads/cassandra-1.1 7c14044f2 -> ec1c64ab5
  refs/heads/trunk b7fdc674a -> 781b248f3


merge from 1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/781b248f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/781b248f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/781b248f

Branch: refs/heads/trunk
Commit: 781b248f3123cb7e61d898803752609fc7d14537
Parents: b7fdc67 ec1c64a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Sep 5 14:50:09 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Sep 5 14:50:09 2012 -0500

----------------------------------------------------------------------
 conf/cassandra-rackdc.properties                   |   20 +++++++++++++++
 .../apache/cassandra/tools/StandaloneScrubber.java |   13 ++++++---
 2 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/781b248f/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index d172c31,10f9cd8..a691844
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@@ -30,8 -32,9 +32,9 @@@ import org.apache.cassandra.db.Table
  import org.apache.cassandra.db.compaction.LeveledManifest;
  import org.apache.cassandra.db.compaction.Scrubber;
  import org.apache.cassandra.io.sstable.*;
 -import org.apache.cassandra.service.AbstractCassandraDaemon;
 +import org.apache.cassandra.service.CassandraDaemon;
  import org.apache.cassandra.utils.OutputHandler;
+ 
  import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
  
  public class StandaloneScrubber


Mime
View raw message