From 9ee3f02a107e0c195ba51861e1922fe5581cd487 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Tue, 3 Jan 2023 18:06:51 +0100
Subject: [PATCH] Version 3.4.0

---
 CHANGELOG             | 8 ++++++++
 CloudronManifest.json | 5 +++++
 test/test.js          | 6 +++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 29ed00f..a5a736d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1590,3 +1590,11 @@ Improve replication performance. See (#12080, #12054, #12009) for more details.
 * fix: iso8601TimeFormat padding issue for certain nanoseconds by @harshavardhana in #16207
 * Add LDAP DNS SRV record lookup support by @donatello in #16201
 
+[3.4.0]
+* Update minio to 2023-01-02T09-40-09Z
+* [Changelog](https://github.com/minio/minio/releases/tag/RELEASE.2023-01-02T09-40-09Z)
+* Rebalancing pools correctly choose object sizes to calculate the final distribution #16240
+* Startup improvements to support WAN-based distributed MinIO setups #16259
+* Add HTTP2-only support for external policy plugin #16225
+* Locks are now spread across different pools based on object affinity #16312
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 9d8774b..701713d 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,8 +5,13 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Distributed object storage",
+<<<<<<< HEAD
   "version": "3.3.3",
   "upstreamVersion": "2022-12-12T19-27-27Z",
+=======
+  "version": "3.4.0",
+  "upstreamVersion": "2023-01-02T09-40-09Z",
+>>>>>>> d881396 (Version 3.4.0)
   "healthCheckPath": "/minio/login",
   "memoryLimit": 805306368,
   "httpPort": 8000,
diff --git a/test/test.js b/test/test.js
index 50d8586..1881d59 100644
--- a/test/test.js
+++ b/test/test.js
@@ -75,7 +75,11 @@ describe('Application life cycle test', function () {
         await browser.sleep(2000);
         await browser.findElement(By.xpath('//input[@id="bucket-name"]')).sendKeys(BUCKET);
         await browser.findElement(By.xpath('//button[@id="create-bucket"]')).click();
-        await waitForElement(By.xpath(`//a[contains(text(), "${BUCKET}")]`));
+        if (app.manifest.version === '3.4.0') {
+            await waitForElement(By.xpath(`//h1[contains(text(), "${BUCKET}")]`));
+        } else {
+            await waitForElement(By.xpath(`//a[contains(text(), "${BUCKET}")]`));
+        }
         await delay(5000);
     }