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

Posted to commits@cloudstack.apache.org by da...@apache.org on 2021/09/03 11:26:36 UTC

[cloudstack] branch main updated (13d8489 -> a000361)

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

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


    from 13d8489  Merge branch '4.15' into main
     add 7a7e449  usage: fix backup usage (#5259)
     add 0bc6e05  ui: Honour default.ui.page.size (#5394)
     add b2fd1f6  server: Allow public templates with no url to be migrated (#5404)
     add a000361  Merge remote-tracking branch 'apache/4.15' into main

No new revisions were added by this update.

Summary of changes:
 .../engine/orchestration/DataMigrationUtility.java |  3 +-
 .../resources/META-INF/db/schema-41510to41520.sql  |  1 +
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |  7 ++-
 ui/src/store/getters.js                            |  3 +-
 ui/src/store/modules/user.js                       | 13 ++++-
 ui/src/views/AutogenView.vue                       | 17 ++++--
 .../com/cloud/usage/parser/BackupUsageParser.java  | 68 ++++++----------------
 7 files changed, 51 insertions(+), 61 deletions(-)