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 99A9510E6C for ; Mon, 24 Feb 2014 18:40:23 +0000 (UTC) Received: (qmail 39896 invoked by uid 500); 24 Feb 2014 18:40:22 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 39812 invoked by uid 500); 24 Feb 2014 18:40:22 -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 39786 invoked by uid 99); 24 Feb 2014 18:40:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Feb 2014 18:40:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A655D9039DF; Mon, 24 Feb 2014 18:40:21 +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: Mon, 24 Feb 2014 18:40:22 -0000 Message-Id: <4a6d769c026b4686a334a88af06bb368@git.apache.org> In-Reply-To: References: 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/98e64a4f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98e64a4f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98e64a4f Branch: refs/heads/master Commit: 98e64a4f65ce5da0451a82d3fa0b8c17cf8e7c5a Parents: fe1a999 5a39a03 Author: Eric Newton Authored: Mon Feb 24 13:40:29 2014 -0500 Committer: Eric Newton Committed: Mon Feb 24 13:40:29 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/test/functional/MetadataIT.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ----------------------------------------------------------------------