From e0f15115529a9a2dea920125a6e8d7682108f646 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Mon, 5 Dec 2022 12:22:18 +0100
Subject: [PATCH] Version 3.3.0

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

diff --git a/CHANGELOG b/CHANGELOG
index e218b59..8e5b381 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1549,3 +1549,9 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * Optimizations in Multipart code-path in multi-pool setups, via #16086
 * Fixes a regression in server side replication due to ETag mismatch issue under specific type of MinIO setups, fixed via #16129
 
+[3.3.0]
+* Update minio to 2022-11-29T23-40-49Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2022-11-29T23-40-49Z)
+* avoid serializing decryptKey() every 15mins by @harshavardhana in #16135
+* kms: fix possible deadlock due to nested RLock calls. by @aead in #16136
+* Improvements in logger and audit webhooks by @anjalshireesh in #16102
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 1de7f09..70c4ec6 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
-  "version": "3.2.0",
-  "upstreamVersion": "2022-11-26T22-43-32Z",
+  "version": "3.3.0",
+  "upstreamVersion": "2022-11-29T23-40-49Z",
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,