From 74eea35e18fc5d2a67004ed698101c4321062caf Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 9 May 2022 09:32:24 -0700
Subject: [PATCH] Version 2.5.0

---
 CHANGELOG             | 6 ++++++
 CloudronManifest.json | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ddbb64e..f954120 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1145,3 +1145,9 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-04T07-45-27Z)
 * Add audit log for decommissioning
 
+[2.5.0]
+* Update minio to 2022-05-08T23-50-31Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-08T23-50-31Z)
+* Fix missing annotations for PVCs by @Sea-you in #14793
+* Add OPA doc and remove deprecation marking by @donatello in #14863
+* avoid concurrent reads and writes to opts.UserDefined by @harshavardhana in #14862
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 53e7f10..967cef8 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "2.4.14",
-  "upstreamVersion": "2022-05-04T07-45-27Z",
+  "version": "2.5.0",
+  "upstreamVersion": "2022-05-08T23-50-31Z",
   "healthCheckPath": "/minio/login",
   "httpPort": 8000,
   "httpPorts": {