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

api: make api/version and release version consistent #2191

Merged
merged 2 commits into from
Mar 4, 2020
Merged

api: make api/version and release version consistent #2191

merged 2 commits into from
Mar 4, 2020

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Mar 4, 2020

Signed-off-by: nolouch nolouch@gmail.com

What problem does this PR solve?

Fix problem

curl http://pd-ip:2379/api/v1/version

got:  1.0.0

What is changed and how it works?

consistent with the release version.

Check List

Tests

  • Unit test

@nolouch
api: fix the version
cfdccc3 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch added component/api HTTP API. needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. needs-cherry-pick-release-3.1 The PR needs to cherry pick to release-3.1 branch. labels Mar 4, 2020
@nolouch nolouch requested review from disksing and rleungx March 4, 2020 06:31
rleungx
rleungx approved these changes Mar 4, 2020
View reviewed changes
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

LGTM

@nolouch nolouch requested a review from HunDunDM March 4, 2020 06:37
HunDunDM
HunDunDM approved these changes Mar 4, 2020
View reviewed changes
Copy link
Member

@HunDunDM HunDunDM left a comment

Choose a reason for hiding this comment

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

LGTM

@nolouch
Copy link
Contributor Author

nolouch commented Mar 4, 2020

/merge

@codecov-io
Copy link

codecov-io commented Mar 4, 2020 •
edited
Loading

Codecov Report

Merging #2191 into master will decrease coverage by 0.06%.
The diff coverage is 51.2%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2191      +/-   ##
==========================================
- Coverage   76.06%   75.99%   -0.07%     
==========================================
  Files         195      195              
  Lines       20687    20677      -10     
==========================================
- Hits        15735    15713      -22     
- Misses       3756     3767      +11     
- Partials     1196     1197       +1
Impacted Files Coverage Δ
server/schedule/checker/rule_checker.go 76.07% <0%> (ø) ⬆️
server/schedule/operator/builder.go 95.12% <100%> (ø) ⬆️
server/schedulers/shuffle_hot_region.go 73.87% <100%> (ø) ⬆️
server/schedulers/hot_region.go 83.2% <100%> (ø) ⬆️
pkg/dashboard/apiserver/apiserver.go 90.47% <100%> (ø) ⬆️
tools/pd-ctl/pdctl/ctl.go 48.95% <27.41%> (ø) ⬆️
server/schedule/region_scatterer.go 82.6% <50%> (ø) ⬆️
server/schedule/selector/selector.go 95.78% <71.42%> (ø) ⬆️
server/schedule/filter/filters.go 80.63% <74.46%> (+3.47%) ⬆️
server/region_syncer/client.go 73.27% <0%> (-11.21%) ⬇️
... and 15 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cfdccc3...b2d938f. Read the comment docs.

@rleungx
Copy link
Member

rleungx commented Mar 4, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 4, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Mar 4, 2020

/run-all-tests

@sre-bot sre-bot merged commit c582b36 into tikv:master Mar 4, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Mar 4, 2020

cherry pick to release-3.0 failed

@sre-bot sre-bot mentioned this pull request Mar 4, 2020
Merged
@sre-bot
Copy link
Contributor

sre-bot commented Mar 4, 2020

cherry pick to release-3.1 in PR #2192

sre-bot added a commit that referenced this pull request Mar 5, 2020
@sre-bot
api: make api/version and release version consistent (#2191) (#2192)
bf609e4 
Signed-off-by: nolouch <nolouch@gmail.com>
nolouch added a commit to nolouch/pd that referenced this pull request Mar 5, 2020
@nolouch
api: make api/version and release version consistent (tikv#2191)
429fb88 
Signed-off-by: nolouch <nolouch@gmail.com>
nolouch added a commit to nolouch/pd that referenced this pull request Mar 5, 2020
@nolouch
api: make api/version and release version consistent (tikv#2191)
4875131 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch mentioned this pull request Mar 5, 2020
Merged
sre-bot pushed a commit that referenced this pull request Mar 10, 2020
@nolouch
api: make api/version and release version consistent (#2191) (#2200)
94bb17c 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch deleted the fix-version branch March 12, 2020 11:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rleungx rleungx rleungx approved these changes

@HunDunDM HunDunDM HunDunDM approved these changes

@disksing disksing Awaiting requested review from disksing

Assignees
No one assigned
Labels
component/api HTTP API. needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. needs-cherry-pick-release-3.1 The PR needs to cherry pick to release-3.1 branch. status/can-merge Indicates a PR has been approved by a committer.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nolouch @codecov-io @rleungx @sre-bot @HunDunDM