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/06/16 06:53:45 UTC
[cloudstack] branch master updated (3ac8194 -> 612100c)
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 3ac8194 setup: Update cloud-set-guest-password.in (#4070)
add 5054766 server: Submitting multiple dynamic VM Scaling API commands for the same instance can result in two usage events in the same second causing a compound key violation in usage service (#3991)
add 77947f2 Merge remote-tracking branch 'origin/4.13' into 4.14
new 612100c Merge remote-tracking branch 'origin/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:
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 87 ++++++++++++++++------
.../main/java/com/cloud/vm/VmWorkReconfigure.java | 19 ++++-
.../com/cloud/server/ManagementServerImpl.java | 10 +--
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 --
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 67 +----------------
.../test/java/com/cloud/vm/UserVmManagerTest.java | 6 +-
7 files changed, 90 insertions(+), 108 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.14'
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 612100c84a540249a4c52522320d4fd25409f197
Merge: 3ac8194 77947f2
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jun 16 12:23:23 2020 +0530
Merge remote-tracking branch 'origin/4.14'
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 87 ++++++++++++++++------
.../main/java/com/cloud/vm/VmWorkReconfigure.java | 19 ++++-
.../com/cloud/server/ManagementServerImpl.java | 10 +--
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 --
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 67 +----------------
.../test/java/com/cloud/vm/UserVmManagerTest.java | 6 +-
7 files changed, 90 insertions(+), 108 deletions(-)