Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Initial work on config merging #368

Closed
wants to merge 17 commits into from
Closed

[Merged by Bors] - Initial work on config merging #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
45908f4
Initial work on config merging
nightkr Apr 8, 2022
80fd66b
Support merging types with generics
nightkr Apr 14, 2022
3d240a8
Support deriving Merge for enums
nightkr Apr 19, 2022
47111b8
Blanket implement Merge for Box<T>
nightkr Apr 19, 2022
0e27807
Document derive macro a bit
nightkr Apr 19, 2022
36fb5e6
Merge branch 'main' into feature/merge
nightkr Apr 19, 2022
c0ca669
Changelog
nightkr Apr 19, 2022
a410a61
Fix doctest errors
nightkr Apr 19, 2022
1500daf
Implement Merge for {BTree,Hash}Map
nightkr Apr 20, 2022
326a905
Merge hasn't been released yet, oops
nightkr Apr 20, 2022
7dc134c
Add crate metadata to the derive crate
nightkr Apr 20, 2022
72442f6
Merge remote-tracking branch 'origin/main' into feature/merge
nightkr May 3, 2022
469b77d
Added resolve to S3ConnectionDef (#388)
fhennig May 3, 2022
3dc4645
Added TlsAuthenticationProvider to be used in AuthenticationClass (#387)
maltesander May 4, 2022
04ffb51
Release 0.18.0 (#389)
sbernauer May 4, 2022
1eea52b
Fix merge error
soenkeliebau May 4, 2022
6df9d57
Merge branch 'main' into feature/merge
nightkr May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ All notable changes to this project will be documented in this file.

### Added

- Typed `Merge` trait ([#368]).
- New commons::s3 module with common S3 connection structs ([#377]).
- New `TlsAuthenticationProvider` for `AuthenticationClass` ([#387]).

[#368]: https://github.com/stackabletech/operator-rs/pull/368
[#377]: https://github.com/stackabletech/operator-rs/issues/377
[#387]: https://github.com/stackabletech/operator-rs/pull/387

Expand Down
4 changes: 4 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ derivative = "2.2.0"
tracing-opentelemetry = "0.17.2"
opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] }
stackable-operator-derive = { path = "stackable-operator-derive" }

[dev-dependencies]
rstest = "0.12.0"
Expand All @@ -44,3 +45,6 @@ serde_yaml = "0.8"
default = ["native-tls"]
native-tls = ["kube/native-tls"]
rustls-tls = ["kube/rustls-tls"]

[workspace]
members = ["stackable-operator-derive"]
Loading