Merge pull request #370 from mendersoftware/release-please--branches-…

…-master--components--mender chore(master): release mender 6.0.0-rc.1
mendersoftware · Nov 14, 2024 · c57ef95 · c57ef95
2 parents 1d9dcb3 + 5633b67
commit c57ef95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  "mender": "6.0.0-rc"
+  "mender": "6.0.0-rc.1"
 }
 
diff --git a/mender/CHANGELOG.md b/mender/CHANGELOG.md
@@ -5,6 +5,9 @@
 ### Bug Fixes
 
 
+- Add http timeouts, only apply https timeouts when https is enabled
+ ([9ead1c8](https://github.com/mendersoftware/mender-helm/commit/9ead1c8e3b7942b80e1d238a0b535c7ff1b58087))  by @chriswiggins
+
 - Passing string to object value `nats.image`
  ([31faa8a](https://github.com/mendersoftware/mender-helm/commit/31faa8ae5025b8be378b480cbef6b180754583fb))  by @alfrunes
 - `tenantadm.certs` are no longer required

diff --git a/mender/Chart.yaml b/mender/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v4.0.0
 description: Mender is a robust and secure way to update all your software and
   deploy your IoT devices at scale with support for customization
 name: mender
-version: 6.0.0-rc
+version: 6.0.0-rc.1
 keywords:
   - mender
   - iot