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 e1c7a447cc3b18f83a184f6c1652cf2078013443 Merge: 65b0bcb069 ab9a0fd69f Author: Rohit Yadav <[email protected]> AuthorDate: Sat Jul 9 22:01:55 2022 +0530 Merge remote-tracking branch 'origin/4.17' .../utils/crypt/EncryptionSecretKeyChanger.java | 2 +- setup/bindir/cloud-setup-databases.in | 6 ++++- ui/src/components/view/ResourceIcon.vue | 4 ++++ ui/src/locales/index.js | 3 ++- ui/src/views/compute/DeployVM.vue | 12 ++++------ ui/src/views/infra/ClusterAdd.vue | 6 +++-- ui/src/views/infra/zone/ZoneWizardAddResources.vue | 6 ++--- .../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 26 ++++++++++++++-------- 8 files changed, 40 insertions(+), 25 deletions(-)
