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 A84F51003B for ; Wed, 16 Apr 2014 19:17:30 +0000 (UTC) Received: (qmail 54216 invoked by uid 500); 16 Apr 2014 19:17:26 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 54189 invoked by uid 500); 16 Apr 2014 19:17:25 -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 54101 invoked by uid 99); 16 Apr 2014 19:17:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Apr 2014 19:17:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C43193C5C9; Wed, 16 Apr 2014 19:17:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Wed, 16 Apr 2014 19:17:16 -0000 Message-Id: <50f2814de12841d3b1dc33e0a339baec@git.apache.org> In-Reply-To: <6e195055f7bc4572aa2ca9627f460200@git.apache.org> References: <6e195055f7bc4572aa2ca9627f460200@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.6.0-SNAPSHOT' Merge branch '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/121cb5f1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/121cb5f1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/121cb5f1 Branch: refs/heads/master Commit: 121cb5f1dab2e0831aaaf10d130bb87ad4bb9f43 Parents: f025e9a 9fb7417 Author: Eric C. Newton Authored: Wed Apr 16 15:15:33 2014 -0400 Committer: Eric C. Newton Committed: Wed Apr 16 15:15:33 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/BackupMasterIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------