Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78c5f460 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78c5f460 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78c5f460 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 78c5f460b1a7f5b2762c2dba7437892151b4d59b Parents: 0328838 e887f37 Author: Mike Drob <md...@cloudera.com> Authored: Tue Jan 21 10:30:19 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Jan 21 10:30:19 2014 -0500 ---------------------------------------------------------------------- test/system/bench/README | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/78c5f460/test/system/bench/README ---------------------------------------------------------------------- diff --cc test/system/bench/README index 03b1e97,06e174b..e5fe692 --- a/test/system/bench/README +++ b/test/system/bench/README @@@ -8,10 -8,11 +8,11 @@@ Syntax for running run.py Specifying a specific benchmark or set of benchmarks runs only those, while not specifying any runs all benchmarks. -l Lists the benchmarks that will be run --v <run_speed> can either be slow, medium or fast --s <log_level> is a number representing the verbosity of the debugging output: 10 is debug, 20 is info, 30 is warning, etc. +-s <run_speed> can either be slow, medium or fast +-v <log_level> is a number representing the verbosity of the debugging output: 10 is debug, 20 is info, 30 is warning, etc. -u <user> user to use when connecting with accumulo. If not set you will be prompted to input it. -p <password> password to use when connecting with accumulo. If not set you will be prompted to input it. + -z <zookeepers> comma delimited lit of zookeeper host:port pairs to use when connecting with accumulo. If not set you will be prompted to input it. -i <instance> instance to use when connecting with accumulo. If not set you will be prompted to input it. **********************************************
