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

[Doc] add milliseconds_diff func and update file external table according to v3.1.9 and 3.2.4 rn (backport #42437) (backport #42439) (backport #42447) (backport #42462) #42466

Merged
merged 2 commits into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #42462 done by Mergify.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

…ding to v3.1.9 and 3.2.4 rn (backport #42437) (backport #42439) (backport #42447) (#42462)

Signed-off-by: evelyn.zhaojie <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: evelyn.zhaojie <[email protected]>
(cherry picked from commit 39618e1)

# Conflicts:
#	docs/docusaurus/sidebars.json
@mergify mergify bot added the conflicts label Mar 12, 2024
Copy link
Contributor Author

mergify bot commented Mar 12, 2024

Cherry-pick of 39618e1 has failed:

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

You are currently cherry-picking commit 39618e1043.
  (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)

Changes to be committed:
	modified:   docs/en/data_source/file_external_table.md
	modified:   docs/en/reference/System_variable.md
	modified:   docs/en/sql-reference/sql-functions/function-list.md
	new file:   docs/en/sql-reference/sql-functions/like-predicate-functions/regexp_extract_all.md
	modified:   docs/zh/reference/System_variable.md
	modified:   docs/zh/sql-reference/sql-functions/function-list.md
	new file:   docs/zh/sql-reference/sql-functions/like-predicate-functions/regexp_extract_all.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/docusaurus/sidebars.json

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

@CLAassistant
Copy link

CLAassistant commented Mar 12, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ evelynzhaojie
❌ mergify[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@github-actions github-actions bot added documentation Improvements or additions to documentation automerge labels Mar 12, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 12, 2024 01:53
@mergify mergify bot closed this Mar 12, 2024
auto-merge was automatically disabled March 12, 2024 01:54

Pull request was closed

Copy link
Contributor Author

mergify bot commented Mar 12, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-42462 branch March 12, 2024 01:54
@evelynzhaojie evelynzhaojie restored the mergify/bp/branch-2.5/pr-42462 branch March 12, 2024 01:56
@evelynzhaojie evelynzhaojie reopened this Mar 12, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) March 12, 2024 01:58
Signed-off-by: evelyn.zhaojie <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 5d44485 into branch-2.5 Mar 12, 2024
22 of 23 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-42462 branch March 12, 2024 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge documentation Improvements or additions to documentation version:2.5.20
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants