Merge branch '4.9'

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/edf4fe95
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/edf4fe95
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/edf4fe95

Branch: refs/heads/master
Commit: edf4fe951db0678c4b882ac7e254ccf46b7e1e29
Parents: bc02858 fd6833b
Author: Rohit Yadav <[email protected]>
Authored: Mon Nov 28 16:01:54 2016 +0530
Committer: Rohit Yadav <[email protected]>
Committed: Mon Nov 28 16:01:54 2016 +0530

----------------------------------------------------------------------
 .travis.yml                                     | 136 +++++++++++++---
 developer/developer-prefill.sql                 |  12 +-
 setup/dev/advanced.cfg                          |  12 +-
 .../smoke/test_outofbandmanagement.py           | 124 ++++++++-------
 test/integration/smoke/test_regions.py          |   2 +-
 tools/travis/after_failure.sh                   |   1 +
 tools/travis/after_script.sh                    |  21 ---
 tools/travis/before_install.sh                  |  58 -------
 tools/travis/before_script.sh                   |  19 +--
 tools/travis/downloadDeps.sh                    | 158 -------------------
 tools/travis/install.sh                         |  24 +--
 tools/travis/script.sh                          |  14 --
 tools/travis/xunit-reader.py                    |   4 +-
 13 files changed, 206 insertions(+), 379 deletions(-)
----------------------------------------------------------------------


Reply via email to