Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 E73BC18D07 for ; Tue, 23 Jun 2015 23:34:10 +0000 (UTC) Received: (qmail 33296 invoked by uid 500); 23 Jun 2015 23:34:10 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 33249 invoked by uid 500); 23 Jun 2015 23:34:10 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 33239 invoked by uid 99); 23 Jun 2015 23:34:10 -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, 23 Jun 2015 23:34:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 88F04E04E4; Tue, 23 Jun 2015 23:34:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mbertozzi@apache.org To: commits@hbase.apache.org Date: Tue, 23 Jun 2015 23:34:10 -0000 Message-Id: <3826cecc720143e28af38e67fb0b465f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] hbase git commit: HBASE-13958 RESTApiClusterManager calls kill() instead of suspend() and resume() Repository: hbase Updated Branches: refs/heads/branch-1 be5c1c7a2 -> 96f74e0b6 refs/heads/branch-1.1 d0a115a72 -> fa8d43441 refs/heads/branch-1.2 be849b5d7 -> 2f004303d refs/heads/master e12336386 -> 1927f0407 HBASE-13958 RESTApiClusterManager calls kill() instead of suspend() and resume() Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1927f040 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1927f040 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1927f040 Branch: refs/heads/master Commit: 1927f040774aa75d2dfe1d95fae9b43ee821361b Parents: e123363 Author: Matteo Bertozzi Authored: Tue Jun 23 16:28:32 2015 -0700 Committer: Matteo Bertozzi Committed: Tue Jun 23 16:28:32 2015 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1927f040/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java index 28fac4e..9ea126a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/RESTApiClusterManager.java @@ -158,12 +158,12 @@ public class RESTApiClusterManager extends Configured implements ClusterManager @Override public void suspend(ServiceType service, String hostname, int port) throws IOException { - hBaseClusterManager.kill(service, hostname, port); + hBaseClusterManager.suspend(service, hostname, port); } @Override public void resume(ServiceType service, String hostname, int port) throws IOException { - hBaseClusterManager.kill(service, hostname, port); + hBaseClusterManager.resume(service, hostname, port); }