Sync grafana/agent:c6fbc923 into grafana/alloy:main #12
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Update loki dep to k190 * port renames * fix loki push api
* Add windows build for boring crypto * add changelog * add details on cngcrypto and fips * put some jsonnet into a function Signed-off-by: erikbaranowski <[email protected]> --------- Signed-off-by: erikbaranowski <[email protected]> Co-authored-by: erikbaranowski <[email protected]>
* fix issue with 64 bit registry * fix issue with 64 bit registry
|
In #11 I did a squash and merge, but here I'm going to try a normal merge commit. |
rfratto
force-pushed
the
sync-grafana-agent
branch
from
472c9b9
to
48737c9
Compare
This was referenced Feb 29, 2024
rfratto
added
the
backport-to-agent:no
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-attempt of #11; looking at different merge strategies for specifically the sync commits.