Skip to content

Commit 27b0036

Browse files
committed
merge conflict: changelog
2 parents 178fdad + f486e43 commit 27b0036

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ All notable changes to this project will be documented in this file.
1010
assembles all relevant Kubernetes resources before anything is applied ([#841]).
1111
- The RBAC ServiceAccount and RoleBinding are now built with the operator-rs `v2::rbac`
1212
functions and carry the full set of recommended labels ([#846]).
13+
- Bump stackable-operator to 0.114.0 ([#855]).
1314

1415
[#841]: https://github.com/stackabletech/druid-operator/pull/841
1516
[#846]: https://github.com/stackabletech/druid-operator/pull/846
17+
[#855]: https://github.com/stackabletech/druid-operator/pull/855
1618

1719
## [26.7.0] - 2026-07-21
1820

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)