[cloudstack] branch main updated (f81d79d -> 6e8c114)

[ro...@apache.org]

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

rohit pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from f81d79d  Updated some offensive words in kubernetes plugin/service with inclusive words/terms. (#5171)
     add 9ee6a57  ui: deployvm - Add option to stay on page (#4843)
     new 6e8c114  Merge remote-tracking branch 'origin/4.15' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ui/public/locales/en.json         |  1 +
 ui/src/views/compute/DeployVM.vue | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15' into main

[ro...@apache.org]

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 6e8c114288aeb8631f5a99edd2d4171fd7baef8f
Merge: f81d79d 9ee6a57
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Fri Jul 2 22:54:51 2021 +0530

    Merge remote-tracking branch 'origin/4.15' into main

 ui/public/locales/en.json         |  1 +
 ui/src/views/compute/DeployVM.vue | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)