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 80A3711D5E for ; Thu, 21 Aug 2014 22:27:10 +0000 (UTC) Received: (qmail 20499 invoked by uid 500); 21 Aug 2014 22:27:10 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 20434 invoked by uid 500); 21 Aug 2014 22:27:10 -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 20384 invoked by uid 99); 21 Aug 2014 22:27: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; Thu, 21 Aug 2014 22:27:10 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 048ED9C72DA; Thu, 21 Aug 2014 22:27:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Thu, 21 Aug 2014 22:27:17 -0000 Message-Id: <9886a18d05a9467ab4055b30e79c52b8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [9/9] git commit: Merge branch '1.6.1-SNAPSHOT' Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb427d7b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb427d7b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb427d7b Branch: refs/heads/master Commit: eb427d7b92e553d45d085f84a65c78baceca8639 Parents: 9832795 e84ff66 Author: Josh Elser Authored: Thu Aug 21 18:08:22 2014 -0400 Committer: Josh Elser Committed: Thu Aug 21 18:08:22 2014 -0400 ---------------------------------------------------------------------- .../test/functional/DeleteTableDuringSplitIT.java | 2 +- .../java/org/apache/accumulo/test/functional/MergeIT.java | 2 +- .../test/functional/SimpleBalancerFairnessIT.java | 10 +++++----- .../java/org/apache/accumulo/test/functional/SslIT.java | 10 +++++----- .../accumulo/test/functional/SslWithClientAuthIT.java | 10 +++++----- 5 files changed, 17 insertions(+), 17 deletions(-) ----------------------------------------------------------------------