From a0a98244248168a907fe06e453cc0f647aef9a0e Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 28 Sep 2022 09:56:02 +0200
Subject: [PATCH] Version 2.9.6

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

diff --git a/CHANGELOG b/CHANGELOG
index ef2022d..556b07b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1431,3 +1431,13 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * helm: specify service account for the jobs by @cowjen01 in #15706
 * site replication: clear config if remove --all specified by @poornas in #15716
 * Fix cancellation leaks by @jiuker in #15721
+
+[2.9.6]
+* Update minio to 2022-09-25T15-44-53Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-09-25T15-44-53Z)
+* fix: parse and save retainUntilDate in correct time format by @harshavardhana in #15741
+* validate correct ETag for the parts sent during CompleteMultipart by @harshavardhana in #15751
+* Relax retention date enforcement on replication target by @poornas in #15752
+* Add auto configuration of replication workers by @poornas in #15636
+* remove unused package internal/smart by @harshavardhana in #15758
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 48824d6..3e1eeeb 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "2.9.5",
-  "upstreamVersion": "2022-09-22T18-57-27Z",
+  "version": "2.9.6",
+  "upstreamVersion": "2022-09-25T15-44-53Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,