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

update tidb roadmap #15194

Merged
merged 7 commits into from
Nov 8, 2023
Merged

update tidb roadmap #15194

merged 7 commits into from
Nov 8, 2023

Conversation

samhld
Copy link
Collaborator

@samhld samhld commented Oct 26, 2023

First-time contributors' checklist

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v7.5 (TiDB 7.5 versions)
  • v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@CLAassistant
Copy link

CLAassistant commented Oct 26, 2023

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 26, 2023
@Oreoxmt Oreoxmt self-requested a review October 27, 2023 05:54
@Oreoxmt Oreoxmt added translation/doing This PR's assignee is translating this PR. v7.5 This PR/issue applies to TiDB v7.5. labels Oct 27, 2023
@ti-chi-bot ti-chi-bot bot removed the missing-translation-status This PR does not have translation status info. label Oct 27, 2023
@Oreoxmt Oreoxmt self-assigned this Oct 30, 2023
@Oreoxmt Oreoxmt added the for-release This PR relates to a TiDB release but does not have a tracked feature. label Oct 30, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

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

@lilin90
Copy link
Member

lilin90 commented Nov 3, 2023

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.✅ Oreoxmt❌ Sam Dillard

Sam Dillard seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

It seems that @samhld still needs to sign the CLA.

@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Nov 3, 2023

/cc @easonn7

Copy link

ti-chi-bot bot commented Nov 3, 2023

@Oreoxmt: GitHub didn't allow me to request PR reviews from the following users: easonn7.

Note that only pingcap members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @easonn7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@easonn7
Copy link
Collaborator

easonn7 commented Nov 4, 2023

LGTM

Copy link
Collaborator Author

@samhld samhld left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 7, 2023
@Oreoxmt Oreoxmt requested a review from ran-huang November 7, 2023 02:29
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 7, 2023
Copy link

ti-chi-bot bot commented Nov 7, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-07 02:29:19.303344587 +0000 UTC m=+3524956.890454732: ☑️ agreed by Oreoxmt.
  • 2023-11-07 06:54:38.015484285 +0000 UTC m=+3540875.602594430: ☑️ agreed by ran-huang.

@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Nov 7, 2023

@samhld The CLA check fails because the commit author's email (Author: Sam Dillard <[email protected]>) is invalid. Please update your local git configuration and correct the author information on the existing commits.

  1. Update your local git configuration:
cd docs
git config user.email [email protected]
  1. Correct the author information on the existing commits:

    git rebase -i 6f9ef141791c8b6becf4ba32d1ffcfd428a744f6

    In the text editor that opens, replace pick with edit next to commit 3a20a0653 and 2f2396499:

    edit 3a20a0653 update tidb-roadmap.md -- first draft
    pick 60b41e40f fix build error
    pick f734508c7 Update tidb-roadmap.md
    pick a3f0f7861 Update tidb-roadmap.md
    pick cda93ef91 Apply suggestions from code review
    edit 2f2396499 remove duplicate
    pick b139606eb Apply suggestions from code review
    pick c3f516dc6 Apply suggestions from code review
    pick 362467e79 Apply suggestions from code review
    

    Save and close the editor.

    When the rebase process stops for each commit to be amended, change the commit's author using git commit --amend --author="Sam Dillard <[email protected]>" and continue the rebase process using git rebase --continue. The following is an example:

    ➜  docs git:(update-tidb-roadmap.md) git rebase -i 6f9ef141791c8b6becf4ba32d1ffcfd428a744f6
    Stopped at 3a20a0653...  update tidb-roadmap.md -- first draft
    You can amend the commit now, with
    
      git commit --amend '-S'
    
    Once you are satisfied with your changes, run
    
      git rebase --continue
    ➜  docs git:(3a20a0653) git commit --amend --author="Sam Dillard <[email protected]>"
    [detached HEAD 6c9f03b4c] update tidb-roadmap.md -- first draft
     Author: Sam Dillard <[email protected]>
     Date: Wed Oct 25 21:06:59 2023 -0700
     1 file changed, 39 insertions(+), 78 deletions(-)
    ➜  docs git:(6c9f03b4c) git rebase --continue
    Stopped at 2f2396499...  remove duplicate
    You can amend the commit now, with
    
      git commit --amend '-S'
    
    Once you are satisfied with your changes, run
    
      git rebase --continue
    ➜  docs git:(c10d9c25e) git commit --amend --author="Sam Dillard <[email protected]>"
    [detached HEAD ddbdb71bf] remove duplicate
     Author: Sam Dillard <[email protected]>
     Date: Mon Nov 6 12:02:08 2023 -0800
     1 file changed, 4 deletions(-)
    ➜  docs git:(ddbdb71bf) git rebase --continue
    Successfully rebased and updated refs/heads/update-tidb-roadmap.md.
    ➜  docs git:(update-tidb-roadmap.md)

    Then, you need to force push the changes:

    git push --force

@samhld samhld force-pushed the update-tidb-roadmap.md branch from 362467e to bff4d81 Compare November 7, 2023 23:52
@Oreoxmt Oreoxmt changed the title update tidb-roadmap.md -- first draft update tidb roadmap Nov 8, 2023
@Oreoxmt Oreoxmt force-pushed the update-tidb-roadmap.md branch from 472bfcd to 28c6265 Compare November 8, 2023 02:44
@Oreoxmt
Copy link
Collaborator

Oreoxmt commented Nov 8, 2023

/approve

Copy link

ti-chi-bot bot commented Nov 8, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Oreoxmt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Nov 8, 2023
@ti-chi-bot ti-chi-bot bot merged commit 0b9064a into master Nov 8, 2023
@Oreoxmt Oreoxmt deleted the update-tidb-roadmap.md branch November 8, 2023 02:51
Oreoxmt pushed a commit to Oreoxmt/docs that referenced this pull request Nov 13, 2023
@Oreoxmt Oreoxmt mentioned this pull request Nov 15, 2023
16 tasks
@Oreoxmt Oreoxmt added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR's assignee is translating this PR. labels Nov 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved for-release This PR relates to a TiDB release but does not have a tracked feature. lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v7.5 This PR/issue applies to TiDB v7.5.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants