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.

Sign up for GitHub

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

Jump to bottom

Feat/replace distro vars #956

Merged
merged 32 commits into from
Jul 21, 2021
Merged

Feat/replace distro vars #956

merged 32 commits into from
Jul 21, 2021

Conversation

shhdgit
Copy link
Member

@shhdgit shhdgit commented Jul 14, 2021

To make the review easier, the work related to distribution variable replacement is placed in this pr, which needs to be merged after #955.

baurine
baurine reviewed Jul 15, 2021
View reviewed changes
pkg/pd/pd.go Outdated Show resolved Hide resolved
baurine
baurine reviewed Jul 15, 2021
View reviewed changes
pkg/tidb/forwarder.go Outdated Show resolved Hide resolved
baurine
baurine reviewed Jul 15, 2021
View reviewed changes
ui/lib/apps/UserProfile/translations/zh.yaml
build_git_hash: '{{distro.tidb}} Dashboard 编译 Git Hash'
build_time: '{{distro.tidb}} Dashboard 编译时间'
standalone: '{{distro.tidb}} Dashboard 运行于独立模式'
pd_version: '{{distro.pd}} 版本号'
Copy link
Collaborator

Choose a reason for hiding this comment

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

It seems some have single quotes, some don't have?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, the parentheses after the colon will be recognized as hash map definition. So we need these quotes.

shhdgit added 3 commits July 16, 2021 11:00
@shhdgit
update: default distro
2572e41
@shhdgit
Merge branch 'master' into feat/distro-resource
ff68317 
Conflicts:
	go.mod
@shhdgit
Merge branch 'feat/distro-resource' into feat/replace-distro-vars
ce3404b 
Conflicts:
	pkg/utils/topology/topology.go
	tools/distro_info_generate/main.go
	ui/config-overrides.js
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch from 16ac7c7 to fe8af7b Compare July 16, 2021 03:14
@shhdgit shhdgit requested a review from baurine July 16, 2021 03:16
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch from 64a1a5b to be58ab8 Compare July 20, 2021 09:11
@shhdgit
Merge branch 'master' into feat/replace-distro-vars
6bdb3e4 
Conflicts:
	ui/dashboardApp/layout/main/Sider/Banner.tsx
	ui/lib/apps/DebugAPI/translations/zh.yaml
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch 3 times, most recently from 47e3947 to 8fe2ef4 Compare July 20, 2021 10:16
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch from 8fe2ef4 to 22e6c50 Compare July 20, 2021 10:16
breezewish
breezewish reviewed Jul 20, 2021
View reviewed changes
Copy link
Member

@breezewish breezewish left a comment

Choose a reason for hiding this comment

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

Mostly great!

shhdgit and others added 2 commits July 20, 2021 21:24
@shhdgit @breezewish
Update pkg/utils/topology/tidb.go
d830e96 
Co-authored-by: Wenxuan <hi@breeswish.org>
@shhdgit @breezewish
Update ui/dashboardApp/index.ts
8bf1ca7 
Co-authored-by: Wenxuan <hi@breeswish.org>
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch from 3ca9743 to 4d7e14e Compare July 20, 2021 13:31
@shhdgit shhdgit force-pushed the feat/replace-distro-vars branch from 4d7e14e to 1097de0 Compare July 20, 2021 13:32
@shhdgit shhdgit requested a review from breezewish July 20, 2021 13:32
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • breeswish

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@breezewish
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 1097de0

@ti-chi-bot ti-chi-bot merged commit 7296574 into pingcap:master Jul 21, 2021
shhdgit added a commit to shhdgit/tidb-dashboard that referenced this pull request Jul 21, 2021
@shhdgit
Feat/replace distro vars (pingcap#956)
523b505
shhdgit added a commit that referenced this pull request Jul 21, 2021
@shhdgit
Release v2021.07.17.1 (#962) [skip pd_pr]
61cbaec 
* Feat/distro resource (#955)

* Feat/replace distro vars (#956)

* update: release version
shhdgit added a commit to shhdgit/tidb-dashboard that referenced this pull request Jul 23, 2021
@shhdgit
Release v2021.07.21.1 (pingcap#962) [skip pd_pr]
69fe330 
* Feat/distro resource (pingcap#955)

* Feat/replace distro vars (pingcap#956)

* update: release version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@breezewish breezewish breezewish approved these changes

@baurine baurine Awaiting requested review from baurine

Assignees
No one assigned
Labels
status/can-merge status/LGT1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@shhdgit @ti-chi-bot @breezewish @baurine