cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jburw...@apache.org
Subject [3/4] git commit: updated refs/heads/master to ad0c25f
Date Thu, 17 Nov 2016 05:52:51 GMT
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 <meaux@cockamamy.net>
Authored: Thu Nov 17 00:46:12 2016 -0500
Committer: John Burwell <meaux@cockamamy.net>
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;


Mime
View raw message