You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by ro...@apache.org on 2020/03/16 09:59:10 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.13'

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 36efbfcfd1db812dfbe2b005108f0d0a90170fcf
Merge: 3575f5e cd6f0cb
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Mar 16 15:28:39 2020 +0530

    Merge remote-tracking branch 'origin/4.13'

 .../main/java/com/cloud/server/StatsCollector.java | 27 +++++++++++-----------
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |  2 ++
 .../java/com/cloud/server/StatsCollectorTest.java  |  6 -----
 3 files changed, 15 insertions(+), 20 deletions(-)