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 2021/03/11 08:04:44 UTC

[cloudstack] branch master updated (843dfaf -> c8f7c0d)

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

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


    from 843dfaf  Merge remote-tracking branch 'origin/4.15'
     add 314baec  ui: Fix breadcrumb discrepancy (#4788)
     add c6e8b8c  ui: Show displayname in compute list view (#4787)
     add 8510344  ui: Show vm name in info card in deployvm (#4786)
     add 9454edd  ui: Show memory allocated percentage when migrating vm (#4784)
     add 14366cd  centos: Mask libvirtd sockets which prevents cloudstack-agent from being setup (#4756)
     add 057ad2b  usage: return guest OS uuid, guest OS name, category ID and name (#4755)
     add 8aa765a  server: delete template on storage over capacity threshold (#4691)
     add a691e87  ui: fix update vm details wrt backend changes (#4670)
     add 1cfb449  db: add schema upgrade from 4.15.0.0 to 4.15.1.0 (#4574)
     add 7a9d43e  test: fix listVolumes call for detach volume migration check (#4785)
     add 025b654  server: use network details from nic network (#4772)
     add 3f84b9a  Merge remote-tracking branch 'origin/4.14' into 4.15
     new c8f7c0d  Merge remote-tracking branch 'origin/4.15'

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:
 .../org/apache/cloudstack/api/ApiConstants.java    |  1 +
 .../api/response/UsageRecordResponse.java          | 39 +++++++++++++++++-----
 .../resources/META-INF/db/schema-41500to41510.sql  |  4 +++
 python/lib/cloudutils/serviceConfig.py             |  6 ++++
 .../main/java/com/cloud/api/ApiResponseHelper.java | 39 ++++++++++++++--------
 .../cloud/template/HypervisorTemplateAdapter.java  | 35 +++++++++----------
 test/integration/smoke/test_vm_life_cycle.py       |  2 +-
 ui/src/components/view/DetailSettings.vue          | 10 ++++++
 ui/src/components/view/InfoCard.vue                |  9 +++--
 ui/src/components/widgets/Breadcrumb.vue           | 11 +++---
 ui/src/config/section/compute.js                   |  2 +-
 ui/src/views/compute/DeployVM.vue                  |  2 +-
 ui/src/views/compute/MigrateWizard.vue             |  7 ++++
 13 files changed, 115 insertions(+), 52 deletions(-)


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

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit c8f7c0d823a732e7da34bbbd58dc46480d06185d
Merge: 843dfaf 3f84b9a
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Thu Mar 11 13:33:44 2021 +0530

    Merge remote-tracking branch 'origin/4.15'
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>

 .../org/apache/cloudstack/api/ApiConstants.java    |  1 +
 .../api/response/UsageRecordResponse.java          | 39 +++++++++++++++++-----
 .../resources/META-INF/db/schema-41500to41510.sql  |  4 +++
 python/lib/cloudutils/serviceConfig.py             |  6 ++++
 .../main/java/com/cloud/api/ApiResponseHelper.java | 39 ++++++++++++++--------
 .../cloud/template/HypervisorTemplateAdapter.java  | 35 +++++++++----------
 test/integration/smoke/test_vm_life_cycle.py       |  2 +-
 ui/src/components/view/DetailSettings.vue          | 10 ++++++
 ui/src/components/view/InfoCard.vue                |  9 +++--
 ui/src/components/widgets/Breadcrumb.vue           | 11 +++---
 ui/src/config/section/compute.js                   |  2 +-
 ui/src/views/compute/DeployVM.vue                  |  2 +-
 ui/src/views/compute/MigrateWizard.vue             |  7 ++++
 13 files changed, 115 insertions(+), 52 deletions(-)

diff --cc ui/src/views/compute/MigrateWizard.vue
index f5082e9,9f050cd..f34a778
--- a/ui/src/views/compute/MigrateWizard.vue
+++ b/ui/src/views/compute/MigrateWizard.vue
@@@ -47,15 -47,9 +47,18 @@@
        <div slot="memused" slot-scope="record">
          {{ record.memoryused | byteToGigabyte }} GB
        </div>
+       <div slot="memoryallocatedpercentage" slot-scope="record">
+         {{ record.memoryallocatedpercentage }}
+       </div>
 +      <div slot="cluster" slot-scope="record">
 +        {{ record.clustername }}
 +      </div>
 +      <div slot="pod" slot-scope="record">
 +        {{ record.podname }}
 +      </div>
 +      <div slot="requiresstoragemigration" slot-scope="record">
 +        {{ record.requiresStorageMotion ? $t('label.yes') : $t('label.no') }}
 +      </div>
        <template slot="select" slot-scope="record">
          <a-radio
            class="host-item__radio"