From 058673d8828aa34d7e1ac979bd00ecf3609f8ab7 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 20 May 2022 09:01:45 -0700
Subject: [PATCH] Version 2.5.1

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

diff --git a/CHANGELOG b/CHANGELOG
index f954120..1cea88a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1151,3 +1151,15 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * 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
+
+[2.5.1]
+* Update minio to 2022-05-19T18-20-59Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-05-19T18-20-59Z)
+* pools: GetObjectNInfo should cover locking during object read by @vadmeste in #14887
+* tracing: Add disk path to storage tracing by @vadmeste in #14883
+* Add support for Access Management Plugin by @donatello in #14875
+* If decom of an object fails, retry for 3 times by @krishnasrinivas in #14861
+* update new name for MINIO_POLICY_OPA_URL by @itsericqiu in #14898
+* add support for extra Prometheus labels by @harshavardhana in #14899
+* use BadRequest HTTP status instead of Conflict for certain errors by @harshavardhana in #14900
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 967cef8..9520980 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "2.5.0",
-  "upstreamVersion": "2022-05-08T23-50-31Z",
+  "version": "2.5.1",
+  "upstreamVersion": "2022-05-19T18-20-59Z",
   "healthCheckPath": "/minio/login",
   "httpPort": 8000,
   "httpPorts": {