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:06 UTC

[cloudstack] branch 4.14 updated (e94a54f -> 77947f2)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from e94a54f  Merge remote-tracking branch 'origin/4.13' into 4.14
     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

No new revisions were added by this update.

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(-)