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:58:39 UTC
[cloudstack] branch master updated (b3a1cb4 -> 3ab43e2)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from b3a1cb4 Allow to configure root disk size via Service Offering (diskoffering of type Service). (#4341)
add 8afb451 fix NPE in volumes statistics (#4388)
add 46ead2d Merge branch '4.13' into 4.14
new 3ab43e2 Merge branch '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 | 44 +++++++++++-----------
4 files changed, 30 insertions(+), 37 deletions(-)
[cloudstack] 01/01: Merge branch '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 master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3ab43e2edbad0543d9e62f0c1399c4be5b8ba029
Merge: b3a1cb4 46ead2d
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Oct 30 15:58:12 2020 +0000
Merge branch '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 | 44 +++++++++++-----------
4 files changed, 30 insertions(+), 37 deletions(-)