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/01/28 05:57:07 UTC
[cloudstack] branch master updated (5ef5ef6 -> 0cb2db6)
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 5ef5ef6 README: Update Docker README file (#3835)
add ff1c6e7 router: Set up metadata/password/dhcp server on gateway IP instead of guest IP in RVR (#3477)
add 71e53ab server: Capacity check should take vms in Migrating state into calculation (#3727)
add 136505b server: double check host capacity when start/migrate a vm (#3728)
add a77d74b server: Fix NPE while update displayvm on vm with dynamic service offering (#3758)
add 8792070 Rethrow takeVMSnapshot() exception instead of returning null in VMSnapshotManagerImpl (#3761)
add 0cb2db6 Merge remote-tracking branch 'origin/4.13'
No new revisions were added by this update.
Summary of changes:
.../com/cloud/vm/VirtualMachineManagerImpl.java | 11 ++++
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 2 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 63 ++++++++++++++++++++--
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
systemvm/debian/etc/apache2/vhost.template | 10 ++--
systemvm/debian/opt/cloud/bin/configure.py | 21 ++++++--
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 4 ++
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 15 ++++--
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 30 ++++++++---
systemvm/debian/opt/cloud/bin/cs/CsFile.py | 14 +++++
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 14 ++---
systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 11 +++-
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 8 +--
14 files changed, 163 insertions(+), 44 deletions(-)