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

Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/10/30 15:54:51 UTC

[cloudstack] 01/01: Merge branch '4.13' into 4.14

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

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

commit 46ead2df710f3713019119ad671ad2b18611ac1e
Merge: b0d300c 8afb451
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Oct 30 15:54:26 2020 +0000

    Merge branch '4.13' into 4.14

 .../com/cloud/api/query/ViewResponseHelper.java    |  7 +---
 .../main/java/com/cloud/server/StatsCollector.java | 14 ++-----
 .../src/main/java/com/cloud/vm/UserVmManager.java  |  2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 45 ++++++++++++----------
 4 files changed, 31 insertions(+), 37 deletions(-)