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

Posted to commits@cloudstack.apache.org by ro...@apache.org on 2023/04/05 06:35:11 UTC

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

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 0d6674e3b3d6b3b27a158748b6c2ac072732c925
Merge: be66eb2a35b 30998d0ab7e
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Apr 5 12:04:48 2023 +0530

    Merge remote-tracking branch 'origin/4.18'

 .../main/java/com/cloud/network/NetworkModelImpl.java    | 10 ++++------
 .../cloud/network/element/ConfigDriveNetworkElement.java |  8 +++++---
 .../com/cloud/network/router/CommandSetupHelper.java     | 16 +++++++---------
 utils/src/main/java/com/cloud/utils/StringUtils.java     |  7 +++++++
 utils/src/test/java/com/cloud/utils/StringUtilsTest.java | 10 ++++++++++
 5 files changed, 33 insertions(+), 18 deletions(-)