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

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


    from 1bccb95  Fix merge issue from 74bae56642b224e9ccf54bf6ad3dd73b4cf13f41
     add e4972c9  doc: fix typo in install notes (#4633)
     add 890e847  server: throw exception when update vm nic on L2 network 
(#4625)
     add 1913c68  server: keep networks order and ips while move a vm with 
multiple networks (#4602)
     add a44fb11  server: add possibility to scale vm to current customer 
offerings (#4622)
     add 313ae1f  server: fix wrong error message when create isolated network 
without SourceNat (#4624)
     add e9dda98  kvm: Use Q35 chipset for UEFI x86_64 (#4576)
     add 9b45ec2  server: select root disk based on user input during vm import 
(#4591)
     new b6b778f0 Merge release branch 4.14 to 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:
 INSTALL.md                                         |  2 +-
 .../service/NetworkOrchestrationService.java       |  2 +-
 .../engine/orchestration/NetworkOrchestrator.java  | 13 +--
 .../kvm/resource/LibvirtComputingResource.java     |  2 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |  4 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 99 ++++++++++++++--------
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     | 38 +++++++--
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |  4 +-
 8 files changed, 113 insertions(+), 51 deletions(-)

Reply via email to