This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 836ef9ec709a30f85d2269f31fb475cf94254852
Merge: 27124c10319 4c27574570d
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Thu Apr 25 09:55:09 2024 +0530
Merge remote-tracking branch 'origin/4.19'
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
systemvm/debian/opt/cloud/bin/cs/CsHelper.py
.github/workflows/ci.yml | 2 +-
.github/workflows/codecov.yml | 2 +-
.github/workflows/ui.yml | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 12 +++++-------
ui/src/views/compute/wizard/NetworkConfiguration.vue | 2 +-
6 files changed, 10 insertions(+), 12 deletions(-)
