Skip to content

Commit

Permalink
Merge tag '127.0.2' into feature/merge-127.0.2-tag
Browse files Browse the repository at this point in the history
- Handle a 409 conflict error when using
  `metalk8s_kubernetes.object_present` Salt state
  due to another component modifying the wanted object
  (PR[#4317](#4317))

- Following to Alert Manager Bump the test email feature from the
  UI wasn't working correctly.
  (PR[#4322](#4322))
  • Loading branch information
TeddyAndrieux committed Jun 18, 2024
2 parents c4ee1c0 + 89fbc3d commit f770016
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# CHANGELOG

## Release 127.0.2 (in development)
## Release 127.0.3 (in development)

## Release 127.0.2

### Enhancements

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_MAJOR=127
VERSION_MINOR=0
VERSION_PATCH=2
VERSION_PATCH=3
VERSION_SUFFIX=-dev

0 comments on commit f770016

Please sign in to comment.