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

[8.11] docs: Update 8.11 ingestion bugfix release progress (backport #12196) #12310

Merged
merged 2 commits into from
Jan 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 29, 2023

This is an automatic backport of pull request #12196 done by Mergify.
Cherry-pick of f4fed82 has failed:

On branch mergify/bp/8.11/pr-12196
Your branch is up to date with 'origin/8.11'.

You are currently cherry-picking commit f4fed828b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/known-issues.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: kruskall <[email protected]>
(cherry picked from commit f4fed82)

# Conflicts:
#	docs/known-issues.asciidoc
@mergify mergify bot requested a review from a team as a code owner December 29, 2023 04:55
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 29, 2023
kruskall
kruskall previously approved these changes Dec 29, 2023
Copy link
Contributor Author

mergify bot commented Jan 1, 2024

This pull request has not been merged yet. Could you please review and merge it @carsonip? 🙏

@carsonip
Copy link
Member

carsonip commented Jan 2, 2024

hmm, we don't have a docs/known-issues.asciidoc in 8.11 branch. #11608 seems to be missing 8.11 backport.

@carsonip
Copy link
Member

carsonip commented Jan 2, 2024

Blocked by #12330, pending rebase.

Copy link
Contributor Author

mergify bot commented Jan 2, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.11/pr-12196 upstream/mergify/bp/8.11/pr-12196
git merge upstream/8.11
git push upstream mergify/bp/8.11/pr-12196

@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Jan 3, 2024

update

☑️ Nothing to do

  • -conflict [📌 update requirement]
  • #commits-behind>0 [📌 update requirement]
  • -closed [📌 update requirement]

@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Jan 3, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]

@carsonip carsonip removed the conflicts There is a conflict in the backported pull request label Jan 3, 2024
@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Jan 3, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]

@carsonip carsonip closed this Jan 3, 2024
@mergify mergify bot deleted the mergify/bp/8.11/pr-12196 branch January 3, 2024 08:56
@carsonip carsonip restored the mergify/bp/8.11/pr-12196 branch January 3, 2024 08:59
@carsonip carsonip reopened this Jan 3, 2024
Copy link
Contributor Author

mergify bot commented Jan 3, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.11/pr-12196 upstream/mergify/bp/8.11/pr-12196
git merge upstream/8.11
git push upstream mergify/bp/8.11/pr-12196

@carsonip
Copy link
Member

carsonip commented Jan 3, 2024

@Mergifyio queue

Copy link
Contributor Author

mergify bot commented Jan 3, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at d00483d

@mergify mergify bot merged commit d00483d into 8.11 Jan 3, 2024
11 checks passed
@mergify mergify bot deleted the mergify/bp/8.11/pr-12196 branch January 3, 2024 09:22
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.

2 participants