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

chore: fix submodule for v3 #12438

Merged
merged 4 commits into from
Apr 2, 2024
Merged

chore: fix submodule for v3 #12438

merged 4 commits into from
Apr 2, 2024

Conversation

slim-bean
Copy link
Collaborator

I incorrectly converted the submodule (nested module) for module github.com/grafana/loki/pkg/push this PR reverts that change and returns this module to it's previous untagged version

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

…hub.com/grafana/loki/pkg/push` this PR reverts that change and returns this module to it's previous untagged version

Signed-off-by: Edward Welch <edward.welch@grafana.com>
@slim-bean slim-bean requested a review from a team as a code owner April 2, 2024 20:14
Signed-off-by: Edward Welch <edward.welch@grafana.com>
# Conflicts:
#	pkg/logproto/logproto.pb.go
Signed-off-by: Edward Welch <edward.welch@grafana.com>
Copy link
Contributor

@JordanRushing JordanRushing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slim-bean slim-bean merged commit 824f5aa into main Apr 2, 2024
10 checks passed
@slim-bean slim-bean deleted the undo-v3-on-push-module branch April 2, 2024 20:42
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
Signed-off-by: Edward Welch <edward.welch@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants