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 DB96B17FB3 for ; Tue, 30 Sep 2014 18:07:16 +0000 (UTC) Received: (qmail 67783 invoked by uid 500); 30 Sep 2014 18:07:16 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 67675 invoked by uid 500); 30 Sep 2014 18:07:16 -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 67590 invoked by uid 99); 30 Sep 2014 18:07:16 -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, 30 Sep 2014 18:07:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58439A049F7; Tue, 30 Sep 2014 18:07:16 +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: Tue, 30 Sep 2014 18:07:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch '1.6' Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2cac013a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2cac013a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2cac013a Branch: refs/heads/master Commit: 2cac013a4f7b67a8d8677e4dbc1cbfc3b3313ff8 Parents: c2bdaf2 8d316a3 Author: Josh Elser Authored: Tue Sep 30 13:59:21 2014 -0400 Committer: Josh Elser Committed: Tue Sep 30 13:59:21 2014 -0400 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/functional/ExamplesIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------