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 2019/05/31 07:02:40 UTC
[cloudstack] branch master updated (fd4309c -> 4ba67b4)
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 fd4309c server: increase POST timeout for local template upload (#3356)
add 8c387f9 vmware: fix potential NPE when memory hotplug capability is checked (#3362)
add bd78030 server: update dhcp configurations in vrs while update default nic of running vms (#3205)
add b8522c9 server: allow dedicate ip range to a domain if ips are used by an accout in the domain (#3206)
add 3737b41 Merge remote-tracking branch 'origin/4.11' into 4.12
new 4ba67b4 Merge remote-tracking branch 'origin/4.12'
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/configuration/ConfigurationManagerImpl.java | 14 +++++++-------
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 13 +++++++++++++
.../com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 2 +-
3 files changed, 21 insertions(+), 8 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.12'
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 4ba67b4c59c152dc297d45ffd367e9c5a00593d2
Merge: fd4309c 3737b41
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri May 31 12:32:11 2019 +0530
Merge remote-tracking branch 'origin/4.12'
.../com/cloud/configuration/ConfigurationManagerImpl.java | 14 +++++++-------
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 13 +++++++++++++
.../com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 2 +-
3 files changed, 21 insertions(+), 8 deletions(-)