From commits-return-6899-archive-asf-public=cust-asf.ponee.io@helix.apache.org Thu Jan 25 22:48:59 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 3FA72180651 for ; Thu, 25 Jan 2018 22:48:58 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 24073160C5F; Thu, 25 Jan 2018 21:48:58 +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 3D8D8160C5A for ; Thu, 25 Jan 2018 22:48:57 +0100 (CET) Received: (qmail 54372 invoked by uid 500); 25 Jan 2018 21:48:56 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 53833 invoked by uid 99); 25 Jan 2018 21:48:55 -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; Thu, 25 Jan 2018 21:48:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C317DF4DF6; Thu, 25 Jan 2018 21:48:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jxue@apache.org To: commits@helix.apache.org Date: Thu, 25 Jan 2018 21:49:27 -0000 Message-Id: <8960f51c0c6b4d09aa481d197ced4260@git.apache.org> In-Reply-To: <431cb4cf46964f4098cae33c2c1cd382@git.apache.org> References: <431cb4cf46964f4098cae33c2c1cd382@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] helix git commit: HELIX-661: fix accidentally deleted import HELIX-661: fix accidentally deleted import Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/ec7eaaae Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/ec7eaaae Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/ec7eaaae Branch: refs/heads/master Commit: ec7eaaae93b47f3cb5a5a3aea5513335b7349910 Parents: 40710b2 Author: hrzhang Authored: Tue Dec 19 09:45:44 2017 -0800 Committer: Junkai Xue Committed: Wed Jan 24 18:32:42 2018 -0800 ---------------------------------------------------------------------- .../java/org/apache/helix/rest/server/TestInstanceAccessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/ec7eaaae/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java ---------------------------------------------------------------------- diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java index 763f95b..ce2bec9 100644 --- a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java +++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java @@ -24,6 +24,7 @@ import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Set; import javax.ws.rs.client.Entity; @@ -135,7 +136,7 @@ public class TestInstanceAccessor extends AbstractTestClass { Response.Status.OK.getStatusCode()); Assert.assertEquals(_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME).getTags(), ImmutableList.of("tag2")); - + // TODO: Reenable the test after storage node fix the problem // Batch disable instances /*