You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cloudstack.apache.org by sh...@apache.org on 2023/06/06 07:42:39 UTC

[cloudstack] 01/01: Merge remote-tracking branch 'apache/4.17' into 4.18

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

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

commit b030ea19a47d4b1015039874844028283ce124fe
Merge: 2d6a0698121 f298008215d
Author: Abhishek Kumar <ab...@gmail.com>
AuthorDate: Tue Jun 6 13:12:12 2023 +0530

    Merge remote-tracking branch 'apache/4.17' into 4.18

 test/integration/smoke/test_vpc_vpn.py  | 297 +++---------
 tools/build/setnextversion.sh           |   1 -
 tools/marvin/marvin/config/test_data.py | 823 +++++++++++++++++++-------------
 3 files changed, 566 insertions(+), 555 deletions(-)