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/23 12:48:20 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.12'

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 2aa4842a94d9ca699bd436ac2f7de275fed62fc3
Merge: 8b75d61 d77e69a
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu May 23 18:17:42 2019 +0530

    Merge remote-tracking branch 'origin/4.12'

 .travis.yml                                        |  46 ++++---
 .../kvm/resource/LibvirtComputingResource.java     |   2 +-
 .../wrapper/LibvirtStartCommandWrapper.java        |  11 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |  29 ++--
 .../bin/setup/{cloud-early-config => bootstrap.sh} | 114 ++++++----------
 .../debian/opt/cloud/bin/setup/cloud-early-config  | 147 ++-------------------
 .../debian/opt/cloud/bin/setup/patchsystemvm.sh    |  63 ---------
 systemvm/debian/opt/cloud/bin/setup/router.sh      |   4 +-
 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh   |   6 +-
 .../scripts/install_systemvm_packages.sh           |   1 +
 10 files changed, 104 insertions(+), 319 deletions(-)