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

docs: Update query-acceleration-blooms.md #14544

Merged
merged 1 commit into from
Nov 27, 2024
Merged

docs: Update query-acceleration-blooms.md #14544

merged 1 commit into from
Nov 27, 2024

Conversation

pbmoses
Copy link
Contributor

@pbmoses pbmoses commented Oct 21, 2024

"single scalable deployment" to "simple scalable deployment"

What this PR does / why we need it:
Corrects "single scalable deployment" to "simple scalable deployment"
Which issue(s) this PR fixes:
Fixes # no issue opened

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • 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

@pbmoses pbmoses requested a review from a team as a code owner October 21, 2024 04:45
@CLAassistant
Copy link

CLAassistant commented Oct 21, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Oct 21, 2024
Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[docs team] LGTM

@JStickler
Copy link
Contributor

@pbmoses Please sign the CLA so that I can merge this.

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 21, 2024

This PR must be merged before a backport PR will be created.

2 similar comments
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 21, 2024

This PR must be merged before a backport PR will be created.

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 21, 2024

This PR must be merged before a backport PR will be created.

@pbmoses pbmoses changed the title Update query-acceleration-blooms.md docs: Update query-acceleration-blooms.md Oct 21, 2024
@pbmoses
Copy link
Contributor Author

pbmoses commented Nov 1, 2024

@JStickler completed CLA

@JStickler
Copy link
Contributor

There's a merge conflict. It looks like this file got renamed in #14555.

Rename "single scalable deployment" to "simple scalable deployment"
@chaudum chaudum merged commit 184630f into main Nov 27, 2024
59 checks passed
@chaudum chaudum deleted the pbmoses-patch-1 branch November 27, 2024 09:04
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 27, 2024

The backport to release-3.0.x 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-14544-to-release-3.0.x origin/release-3.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 184630f341edee03235cb6f8502d785120d56b3a

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.0.x
# Create the PR body template
PR_BODY=$(gh pr view 14544 --json body --template 'Backport 184630f341edee03235cb6f8502d785120d56b3a from #14544{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: Update query-acceleration-blooms.md (backport release-3.0.x)' --body-file - --label 'size/XS' --label 'type/docs' --label 'backport' --base release-3.0.x --milestone release-3.0.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.0.x

# Create a pull request where the `base` branch is `release-3.0.x` and the `compare`/`head` branch is `backport-14544-to-release-3.0.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14544-to-release-3.0.x

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 27, 2024

The backport to release-3.1.x 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-14544-to-release-3.1.x origin/release-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 184630f341edee03235cb6f8502d785120d56b3a

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 14544 --json body --template 'Backport 184630f341edee03235cb6f8502d785120d56b3a from #14544{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: Update query-acceleration-blooms.md (backport release-3.1.x)' --body-file - --label 'size/XS' --label 'type/docs' --label 'backport' --base release-3.1.x --milestone release-3.1.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.1.x

# Create a pull request where the `base` branch is `release-3.1.x` and the `compare`/`head` branch is `backport-14544-to-release-3.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14544-to-release-3.1.x

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 27, 2024

The backport to release-3.2.x 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-14544-to-release-3.2.x origin/release-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 184630f341edee03235cb6f8502d785120d56b3a

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 14544 --json body --template 'Backport 184630f341edee03235cb6f8502d785120d56b3a from #14544{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: Update query-acceleration-blooms.md (backport release-3.2.x)' --body-file - --label 'size/XS' --label 'type/docs' --label 'backport' --base release-3.2.x --milestone release-3.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-14544-to-release-3.2.x

# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-14544-to-release-3.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14544-to-release-3.2.x

loki-gh-app bot pushed a commit that referenced this pull request Nov 27, 2024
JStickler pushed a commit that referenced this pull request Nov 27, 2024
JStickler added a commit that referenced this pull request Nov 27, 2024
JStickler pushed a commit that referenced this pull request Nov 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.0.x backport release-3.1.x backport release-3.2.x backport release-3.3.x backport-failed size/XS type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants