Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A2C3A200B61 for ; Tue, 9 Aug 2016 23:23:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A16BE160A6B; Tue, 9 Aug 2016 21:23:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CB49F160AB6 for ; Tue, 9 Aug 2016 23:23:30 +0200 (CEST) Received: (qmail 30686 invoked by uid 500); 9 Aug 2016 21:23:30 -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 30624 invoked by uid 99); 9 Aug 2016 21:23:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2016 21:23:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CF7C8E5724; Tue, 9 Aug 2016 21:23:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Tue, 09 Aug 2016 21:23:31 -0000 Message-Id: <9a284c2d974f48c9981d0f62a301bcb6@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Tue, 09 Aug 2016 21:23:31 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f5c9f7f7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f5c9f7f7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f5c9f7f7 Branch: refs/heads/master Commit: f5c9f7f731ebf5c5b17daf3a374b0b12edb6a0b2 Parents: 81cc8be 3fded56 Author: Christopher Tubbs Authored: Tue Aug 9 17:23:12 2016 -0400 Committer: Christopher Tubbs Committed: Tue Aug 9 17:23:12 2016 -0400 ---------------------------------------------------------------------- .../accumulo/server/util/MetadataTableUtil.java | 2 ++ .../functional/TabletStateChangeIteratorIT.java | 22 +++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5c9f7f7/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f5c9f7f7/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java ---------------------------------------------------------------------- diff --cc test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java index bc21123,5001f1b..62374d2 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletStateChangeIteratorIT.java @@@ -58,10 -59,9 +59,8 @@@ import org.apache.accumulo.server.maste import org.apache.accumulo.server.master.state.TabletStateChangeIterator; import org.apache.accumulo.server.zookeeper.ZooLock; import org.apache.hadoop.io.Text; - import org.junit.AfterClass; - import org.junit.BeforeClass; import org.junit.Test; -import com.google.common.base.Predicate; import com.google.common.collect.Sets; /**