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.

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

Sync grafana/agent:c6fbc923 into grafana/alloy:main #11

Merged
merged 4 commits into from
Feb 29, 2024

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Feb 29, 2024

Process for which I did this:

git remote add grafana-agent [email protected]:grafana/agent.git 
git fetch grafana-agent main 
git checkout -b sync-grafana-agent 
git merge grafana-agent/main 
# (fix merge conflicts)
git commit  

thampiotr and others added 4 commits February 28, 2024 15:00
* 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
@rfratto rfratto changed the title Sync grafana/agent:main into grafana/alloy:main Sync grafana/agent:c6fbc9236ca6051d612a627b8099a02482beefcc into grafana/alloy:main Feb 29, 2024
@rfratto rfratto changed the title Sync grafana/agent:c6fbc9236ca6051d612a627b8099a02482beefcc into grafana/alloy:main Sync grafana/agent:c6fbc923 into grafana/alloy:main Feb 29, 2024
@rfratto
Copy link
Member Author

rfratto commented Feb 29, 2024

This is going to be merged via a squash commit, which I think means we'll come across the same exact merge conflicts every single time we do this.

There's probably an argument for these sync PRs to be merged via actual merge commits, but I'd like to play around with our existing behaviour (squashing) a few more times before we entertain merge commits.

@rfratto rfratto enabled auto-merge (squash) February 29, 2024 03:48
@rfratto rfratto disabled auto-merge February 29, 2024 03:48
@rfratto rfratto merged commit 121864e into main Feb 29, 2024
9 checks passed
@rfratto rfratto deleted the sync-grafana-agent branch February 29, 2024 03:48
@rfratto rfratto restored the sync-grafana-agent branch February 29, 2024 03:55
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 31, 2024
@rfratto rfratto added the backport-to-agent:no PR should NOT be backported to the agent repo. label Apr 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport-to-agent:no PR should NOT be backported to the agent repo. frozen-due-to-age
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants