You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2018/04/18 16:14:12 UTC

[cloudstack] 01/01: Forward merge branch '4.11' (PR: #2576) to master

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

rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 15afc35ff978bcedb05d0a0673f8bac9ac49743a
Merge: b940a89 bfe4cb0
Author: Rafael Weingärtner <ra...@gmail.com>
AuthorDate: Wed Apr 18 13:11:44 2018 -0300

    Forward merge branch '4.11' (PR: #2576) to master

 systemvm/debian/opt/cloud/bin/configure.py      | 7 ++++---
 systemvm/debian/opt/cloud/bin/cs/CsProcess.py   | 6 +++---
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 4 ++--
 systemvm/debian/opt/cloud/bin/line_edit.py      | 1 +
 systemvm/debian/opt/cloud/bin/update_config.py  | 1 +
 systemvm/debian/opt/cloud/bin/vmdata.py         | 1 +
 systemvm/test/TestCsAddress.py                  | 1 +
 systemvm/test/TestCsApp.py                      | 1 +
 systemvm/test/TestCsCmdLine.py                  | 1 +
 systemvm/test/TestCsConfig.py                   | 1 +
 systemvm/test/TestCsDatabag.py                  | 1 +
 systemvm/test/TestCsDhcp.py                     | 1 +
 systemvm/test/TestCsFile.py                     | 1 +
 systemvm/test/TestCsGuestNetwork.py             | 1 +
 systemvm/test/TestCsHelper.py                   | 1 +
 systemvm/test/TestCsInterface.py                | 1 +
 systemvm/test/TestCsNetfilter.py                | 1 +
 systemvm/test/TestCsProcess.py                  | 1 +
 systemvm/test/TestCsRedundant.py                | 1 +
 systemvm/test/TestCsRoute.py                    | 1 +
 systemvm/test/TestCsRule.py                     | 1 +
 systemvm/test/runtests.sh                       | 6 +++---
 tools/travis/before_install.sh                  | 6 +++++-
 23 files changed, 35 insertions(+), 12 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
rafael@apache.org.