[cloudstack] branch master updated (d36e1a6 -> ecd2b95)

[ro...@apache.org]

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 d36e1a6  server/test: Move test files to right location (#3085)
     add 408cce4  travis: fail fast if --with-marvin fails with nose (#3024)
     new ecd2b95  Merge remote-tracking branch 'origin/4.11'

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:
 tools/travis/before_install.sh | 4 +---
 tools/travis/script.sh         | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

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

[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 ecd2b95d492282d60107f5e132e39f0cd2d808c0
Merge: d36e1a6 408cce4
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Dec 7 23:46:04 2018 +0530

    Merge remote-tracking branch 'origin/4.11'

 tools/travis/before_install.sh | 4 +---
 tools/travis/script.sh         | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)