Skip to content

Commit

Permalink
Merge pull request #389 from mendersoftware/release-please--branches-…
Browse files Browse the repository at this point in the history
…-master--components--mender

chore(master): release mender 6.0.0-rc.2
  • Loading branch information
oldgiova authored Nov 28, 2024
2 parents 44e3aaa + 2f8a157 commit 73b6c4d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"mender": "6.0.0-rc.1"
"mender": "6.0.0-rc.2"
}

36 changes: 31 additions & 5 deletions mender/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
---
## mender-6.0.0-rc.2 - 2024-11-28


### Bug Fixes


- Tenantadm endpoint fix
([14f15a1](https://github.com/mendersoftware/mender-helm/commit/14f15a16faf3ede3b49eefb5a820be8695a69f10)) by @oldgiova




### Typo


- Update UPGRADE_from_v5_to_v6.md
([f4256fc](https://github.com/mendersoftware/mender-helm/commit/f4256fcc4d4d876a827fa60510ddb51df31857a2)) by @LinAnt


Fixes typo in the header






## mender-6.0.0 - 2024-10-31


Expand Down Expand Up @@ -745,11 +771,11 @@
As described in 'feat: Device count via deviceauth-enterprise cli.'
in the documentation [1], Device License Count is only available
with Enterprise.

Avoid ImagePullBackOff and ErrImagePull by not deploying the
device-auth-license-count cron job when global.enterprise is
disabled.

[1] https://github.com/mendersoftware/mender-docs/commit/0f4ca50dbee9fd98f131e6e15ae7c0572b7d79d7


Expand All @@ -765,9 +791,9 @@
To make enabling the device-auth-license-count cron job
even more robust, add a new variable to control this
preview feature.

Thank you to @oldgiova for the suggestion [1].

[1] https://github.com/mendersoftware/mender-helm/pull/151#discussion_r1193086966


Expand Down Expand Up @@ -1006,7 +1032,7 @@

This commit reworks the test job and the helper scripts to run the tests
in HM staging, namespace mender-helm-tests.

It assumes only one CI pipeline is running in parallel.
- Update chart for Mender 2.6.0
([MEN-4486](https://northerntech.atlassian.net/browse/MEN-4486)) ([f009fb9](https://github.com/mendersoftware/mender-helm/commit/f009fb9549fba5943b8c7340d358321b3d8b9343)) by @lluiscampos
Expand Down
2 changes: 1 addition & 1 deletion mender/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
version: 6.0.0-rc.2
keywords:
- mender
- iot
Expand Down

0 comments on commit 73b6c4d

Please sign in to comment.