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

Backport Memberlist status page in k101 #6342

Merged
merged 1 commit into from
Jun 8, 2022
Merged

Conversation

JordanRushing
Copy link
Contributor

@JordanRushing JordanRushing commented Jun 8, 2022

Signed-off-by: JordanRushing [email protected]

What this PR does / why we need it:
re: #6322

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:
N/A

Checklist

  • Documentation added
  • Tests updated
  • Is this an important fix or new feature? Add an entry in the CHANGELOG.md.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@JordanRushing JordanRushing requested a review from cstyan June 8, 2022 20:30
@JordanRushing JordanRushing requested a review from a team as a code owner June 8, 2022 20:30
@JordanRushing JordanRushing self-assigned this Jun 8, 2022
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
-            storage	-0.4%
+           chunkenc	0%
+              logql	0%
-               loki	-0.6%

@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0.3%
+            querier	0%
+ querier/queryrange	0.1%
+               iter	0%
-            storage	-0.4%
+           chunkenc	0%
+              logql	0%
+               loki	0%

@owen-d owen-d merged commit f90d1ee into grafana:k101 Jun 8, 2022
@grafanabot
Copy link
Collaborator

The backport to k101 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6342-to-k101 origin/k101
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f90d1ee399e756bec80885c9fe823c77bc024ac8
# Push it to GitHub
git push --set-upstream origin backport-6342-to-k101
git switch main
# Remove the local backport branch
git branch -D backport-6342-to-k101

Then, create a pull request where the base branch is k101 and the compare/head branch is backport-6342-to-k101.

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.

3 participants