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 2021/02/05 10:33:08 UTC
[cloudstack] branch master updated (ff376d8 -> ba127da)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from ff376d8 Merge release branch 4.15 to master
add 05301b1 server: prevent update vm read-only details (#4629)
add 66d49c5 Merge release branch 4.14 to 4.15
add 78f73c1 server: Fix update capacity for hosts take long time if there are many service offerings (#4623)
add 4de6ac3 server: Get vm network/disk statistics and update database per host (#4601)
add db4f9e9 test: fix checksums for test template (#4655)
add b8e6c08 setup: Update cloud-setup-databases.in (#4653)
add 29e3098 test: hardware required for changeserviceoffering (#4650)
add 6bde138 Merge remote-tracking branch 'origin/4.14' into 4.15
new ba127da Merge remote-tracking branch 'origin/4.15'
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:
.../java/com/cloud/capacity/CapacityManager.java | 5 ++
.../java/com/cloud/alert/AlertManagerImpl.java | 12 ++++-
.../com/cloud/capacity/CapacityManagerImpl.java | 11 +++++
.../main/java/com/cloud/server/StatsCollector.java | 55 +++++++++++-----------
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 ++++--
setup/bindir/cloud-setup-databases.in | 2 +-
.../integration/component/test_mm_domain_limits.py | 2 +-
7 files changed, 67 insertions(+), 35 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15'
Posted by ro...@apache.org.
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 ba127dab3e2ebda5994a4d2982d718e14be91d76
Merge: ff376d8 6bde138
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Feb 5 16:02:26 2021 +0530
Merge remote-tracking branch 'origin/4.15'
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
.../java/com/cloud/capacity/CapacityManager.java | 5 ++
.../java/com/cloud/alert/AlertManagerImpl.java | 12 ++++-
.../com/cloud/capacity/CapacityManagerImpl.java | 11 +++++
.../main/java/com/cloud/server/StatsCollector.java | 55 +++++++++++-----------
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 ++++--
setup/bindir/cloud-setup-databases.in | 2 +-
.../integration/component/test_mm_domain_limits.py | 2 +-
7 files changed, 67 insertions(+), 35 deletions(-)