(cloudstack) branch 4.19 updated (21c98af13de -> a53365d1c7f)

[vi...@apache.org]

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

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


    from 21c98af13de Fix backup offering buttons for instances in data view (#9391)
     add 8a00e25de91 Fix list backups after backup vm is expunged (#9392)
     new a53365d1c7f Merge release branch 4.18 to 4.19

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:
 .../apache/cloudstack/api/command/user/backup/ListBackupsCmd.java   | 3 +++
 api/src/main/java/org/apache/cloudstack/backup/Backup.java          | 1 +
 .../schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java | 1 +
 .../main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java   | 6 +++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

(cloudstack) 01/01: Merge release branch 4.18 to 4.19

[vi...@apache.org]

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

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

commit a53365d1c7f8b69124b258a1c44b03df6101d705
Merge: 21c98af13de 8a00e25de91
Author: Vishesh <vi...@gmail.com>
AuthorDate: Mon Jul 15 17:07:36 2024 +0530

    Merge release branch 4.18 to 4.19
    
    * 4.18:
      Fix list backups after backup vm is expunged (#9392)

 .../apache/cloudstack/api/command/user/backup/ListBackupsCmd.java   | 3 +++
 api/src/main/java/org/apache/cloudstack/backup/Backup.java          | 1 +
 .../schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java | 1 +
 .../main/java/org/apache/cloudstack/backup/dao/BackupDaoImpl.java   | 6 +++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --cc api/src/main/java/org/apache/cloudstack/backup/Backup.java
index f369367957d,0a5c8634927..df1b243dbab
--- a/api/src/main/java/org/apache/cloudstack/backup/Backup.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/Backup.java
@@@ -134,9 -132,10 +134,10 @@@ public interface Backup extends Control
      }
  
      long getVmId();
+     long getBackupOfferingId();
      String getExternalId();
      String getType();
 -    String getDate();
 +    Date getDate();
      Backup.Status getStatus();
      Long getSize();
      Long getProtectedSize();