Return-Path: 
 <commits-return-8015-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 5786910549
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 21 Jan 2014 15:32:44 +0000 (UTC)
Received: (qmail 51569 invoked by uid 500); 21 Jan 2014 15:32:22 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 51509 invoked by uid 500); 21 Jan 2014 15:32:21 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 51314 invoked by uid 99); 21 Jan 2014 15:32:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jan 2014 15:32:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 2097653D54; Tue, 21 Jan 2014 15:32:04 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: mdrob@apache.org
To: commits@accumulo.apache.org
Date: Tue, 21 Jan 2014 15:32:08 -0000
Message-Id: <33199e24938743b996062ba682a82278@git.apache.org>
In-Reply-To: <2a0fe69b83ca4c149a9e8324324dc10b@git.apache.org>
References: <2a0fe69b83ca4c149a9e8324324dc10b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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.5.1-SNAPSHOT
Commit: 78c5f460b1a7f5b2762c2dba7437892151b4d59b
Parents: 0328838 e887f37
Author: Mike Drob <mdrob@cloudera.com>
Authored: Tue Jan 21 10:30:19 2014 -0500
Committer: Mike Drob <mdrob@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.
  
  **********************************************