You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/03/20 01:34:57 UTC
[11/16] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cccaf7ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cccaf7ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cccaf7ca
Branch: refs/heads/trunk
Commit: cccaf7ca20ca521272835863aec91fff85b2ea06
Parents: 1d05bda 53b6116
Author: Paulo Motta <pa...@apache.org>
Authored: Mon Mar 19 22:22:22 2018 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Mon Mar 19 22:22:22 2018 -0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/nodetool/Scrub.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cccaf7ca/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/nodetool/Scrub.java
index ead2fd4,3c726b9..263291d
--- a/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
+++ b/src/java/org/apache/cassandra/tools/nodetool/Scrub.java
@@@ -49,8 -49,13 +49,8 @@@ public class Scrub extends NodeToolCm
description = "Do not validate columns using column validator")
private boolean noValidation = false;
- @Option(title = "jobs",
- name = {"-j", "--jobs"},
- description = "Number of sstables to scrub simultanously, set to 0 to use all available compaction threads")
- private int jobs = 2;
-
@Option(title = "reinsert_overflowed_ttl",
- name = {"r", "--reinsert-overflowed-ttl"},
+ name = {"-r", "--reinsert-overflowed-ttl"},
description = StandaloneScrubber.REINSERT_OVERFLOWED_TTL_OPTION_DESCRIPTION)
private boolean reinsertOverflowedTTL = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org