From e5d500ab19ad71be822146b40c037faea3aab0e032255ca5920db3e7e0115b50 Mon Sep 17 00:00:00 2001
From: jenting hsiao <jenting.hsiao@suse.com>
Date: Thu, 8 Apr 2021 03:34:58 +0000
Subject: [PATCH] Accepting request 883712 from
 home:jenting:branches:devel:kubic

- Update to version 1.5.4:
  * Add cherry-pick commits and changelog for v1.5.4 (#3651)

OBS-URL: https://build.opensuse.org/request/show/883712
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/velero?expand=0&rev=14
---
 _service            | 2 +-
 _servicedata        | 2 +-
 velero-1.5.3.tar.gz | 3 ---
 velero-1.5.4.tar.gz | 3 +++
 velero.changes      | 6 ++++++
 velero.spec         | 4 ++--
 vendor.tar.gz       | 4 ++--
 7 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 velero-1.5.3.tar.gz
 create mode 100644 velero-1.5.4.tar.gz

diff --git a/_service b/_service
index ab32238..8dee68d 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="revision">v1.5.3</param>
+    <param name="revision">v1.5.4</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/_servicedata b/_servicedata
index 834db32..c9c2a1c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/vmware-tanzu/velero</param>
-              <param name="changesrevision">123109a3bcac11dbb6783d2758207bac0d0817cb</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">525705bceb8895b9da2cf2a1d1a79b99d74723cb</param></service></servicedata>
\ No newline at end of file
diff --git a/velero-1.5.3.tar.gz b/velero-1.5.3.tar.gz
deleted file mode 100644
index e22e969..0000000
--- a/velero-1.5.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f541416805f792c9f6e5ec2620b0c0f5d43d32ee6714f99fb9fadd8ee9072378
-size 5934935
diff --git a/velero-1.5.4.tar.gz b/velero-1.5.4.tar.gz
new file mode 100644
index 0000000..da8134a
--- /dev/null
+++ b/velero-1.5.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef798a24d345cc332dcb17f9c3de6da9aaa457c5765ea2c7a30f45768d146614
+size 5934858
diff --git a/velero.changes b/velero.changes
index b8789df..cb4fe39 100644
--- a/velero.changes
+++ b/velero.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 08 02:27:02 UTC 2021 - jenting.hsiao@suse.com
+
+- Update to version 1.5.4:
+  * Add cherry-pick commits and changelog for v1.5.4 (#3651)
+
 -------------------------------------------------------------------
 Sat Jan 16 13:59:15 UTC 2021 - jenting.hsiao@suse.com
 
diff --git a/velero.spec b/velero.spec
index 91aee91..c879f91 100644
--- a/velero.spec
+++ b/velero.spec
@@ -17,11 +17,11 @@
 
 
 %define goipath github.com/vmware-tanzu/velero
-%define commit 123109a3bcac11dbb6783d2758207bac0d0817cb
+%define commit 525705bceb8895b9da2cf2a1d1a79b99d74723cb
 %define gitstate clean
 
 Name:           velero
-Version:        1.5.3
+Version:        1.5.4
 Release:        0
 Summary:        Backup program with deduplication and encryption
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 6e78ef7..52b74b7 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68cc4ad08009b9e6097622051d5a1ff3ebf81f20dd794116f2b922864190a833
-size 6920902
+oid sha256:060c9e3e24b4c1525c986b48b6f661aaf63cce0c5e2ae53430c657c52fffa38b
+size 6920903