Return-Path: 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 D34BE10E64 for ; Tue, 7 Jan 2014 14:27:21 +0000 (UTC) Received: (qmail 47993 invoked by uid 500); 7 Jan 2014 14:23:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 47757 invoked by uid 500); 7 Jan 2014 14:23:31 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 47550 invoked by uid 99); 7 Jan 2014 14:23:01 -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, 07 Jan 2014 14:23:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E69A739280; Tue, 7 Jan 2014 14:23:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhavanki@apache.org To: commits@accumulo.apache.org Date: Tue, 07 Jan 2014 14:23:08 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/10] git commit: ACCUMULO-2042 Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT ACCUMULO-2042 Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4cddf97 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c4cddf97 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c4cddf97 Branch: refs/heads/master Commit: c4cddf97f86d3a20a945c417eb5546f8a0c2e54a Parents: 98211f5 833ac35 Author: Bill Havanki Authored: Tue Jan 7 09:19:56 2014 -0500 Committer: Bill Havanki Committed: Tue Jan 7 09:19:56 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/test/scalability/Run.java | 2 +- test/system/scalability/README | 35 ++++++++++++++------ test/system/scalability/run.py | 2 ++ 3 files changed, 28 insertions(+), 11 deletions(-) ----------------------------------------------------------------------