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 C2840200BD4 for ; Thu, 17 Nov 2016 06:52:51 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C1163160B08; Thu, 17 Nov 2016 05:52:51 +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 16E80160B17 for ; Thu, 17 Nov 2016 06:52:50 +0100 (CET) Received: (qmail 51908 invoked by uid 500); 17 Nov 2016 05:52:50 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 51842 invoked by uid 99); 17 Nov 2016 05:52:50 -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, 17 Nov 2016 05:52:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F2590F179B; Thu, 17 Nov 2016 05:52:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jburwell@apache.org To: commits@cloudstack.apache.org Date: Thu, 17 Nov 2016 05:52:51 -0000 Message-Id: <0f07398c5b0540b5a141fdaa851962cd@git.apache.org> In-Reply-To: <9d798359358e40cfad6fa976db12d37c@git.apache.org> References: <9d798359358e40cfad6fa976db12d37c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: updated refs/heads/master to ad0c25f archived-at: Thu, 17 Nov 2016 05:52:51 -0000 Merge release branch 4.8 to 4.9 * 4.8: CLOUDSTACK-9071: Properly parse stats.output.uri in StatsCollector Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc1a7b43 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc1a7b43 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc1a7b43 Branch: refs/heads/master Commit: dc1a7b4338b37bb4ca9b3e4288bca0439969c1c0 Parents: 20b4376 293ec4f Author: John Burwell Authored: Thu Nov 17 00:46:12 2016 -0500 Committer: John Burwell Committed: Thu Nov 17 00:46:12 2016 -0500 ---------------------------------------------------------------------- server/src/com/cloud/server/StatsCollector.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc1a7b43/server/src/com/cloud/server/StatsCollector.java ---------------------------------------------------------------------- diff --cc server/src/com/cloud/server/StatsCollector.java index e4687e4,ee9e41d..b5d67c7 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@@ -34,14 -33,11 +34,15 @@@ import java.util.concurrent.TimeUnit import javax.inject.Inject; +import org.apache.cloudstack.outofbandmanagement.OutOfBandManagement; +import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService; +import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementVO; +import org.apache.cloudstack.outofbandmanagement.dao.OutOfBandManagementDao; +import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.usage.UsageUtils; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; - import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;