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/23 06:59:07 UTC

[cloudstack] branch master updated (475ae90 -> 029fc51)

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 475ae90  Update UserVmManagerImpl.java (#4162)
     add 97f21c1  xenserver: Fixed null pointer and deployment issue on Xenserver with L2 Guest network with configDrive (#4004)
     add 5f23171  Merge remote-tracking branch 'origin/4.13' into 4.14
     new 029fc51  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:
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  1 -
 .../xenserver/resource/CitrixResourceBase.java     | 33 +++++-------
 .../xenbase/CitrixMigrateCommandWrapper.java       |  3 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java | 59 ++++++++++++----------
 .../network/element/ConfigDriveNetworkElement.java | 12 ++---
 5 files changed, 53 insertions(+), 55 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 029fc51960db4ff11e2d2560f668ecdab7e21ecf
Merge: 475ae90 5f23171
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Jun 23 12:28:42 2020 +0530

    Merge remote-tracking branch 'origin/4.14'

 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  1 -
 .../xenserver/resource/CitrixResourceBase.java     | 33 +++++-------
 .../xenbase/CitrixMigrateCommandWrapper.java       |  3 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java | 59 ++++++++++++----------
 .../network/element/ConfigDriveNetworkElement.java | 12 ++---
 5 files changed, 53 insertions(+), 55 deletions(-)