This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit cdddecb41ef74ae8f3b2a67c03b7c7be20f2bb2d Merge: 026eab0 5c2b8f8 Author: Daan Hoogland <daan.hoogl...@shapeblue.com> AuthorDate: Tue Feb 27 12:42:41 2018 +0100 Merge release branch 4.11 to master * 4.11: CLOUDSTACK-10306: Upgrade to VMware 6.5 vim jar dependency (#2467) CLOUDSTACK-10298: fix for recreation of an earlier deleted Nuage managed network (#2460) deps/install-non-oss.sh | 3 + plugins/network-elements/nuage-vsp/pom.xml | 2 +- .../network/guru/NuageVspGuestNetworkGuru.java | 7 +- pom.xml | 2 +- test/integration/plugins/nuagevsp/nuageTestCase.py | 3 + .../nuagevsp/test_nuage_vsp_mngd_subnets.py | 672 +++++++++++++++------ tools/marvin/marvin/lib/base.py | 5 +- 7 files changed, 518 insertions(+), 176 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.