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:50 UTC
[cloudstack] branch 4.14 updated (b0d300c -> 46ead2d)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from b0d300c Merge branch '4.13' into 4.14
add 8afb451 fix NPE in volumes statistics (#4388)
new 46ead2d Merge branch '4.13' into 4.14
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../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(-)
[cloudstack] 01/01: Merge branch '4.13' into 4.14
Posted by da...@apache.org.
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(-)