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) #2200

Merged
merged 1 commit into from
Mar 10, 2020
Merged

api: make api/version and release version consistent (#2191) #2200

merged 1 commit into from
Mar 10, 2020

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Mar 5, 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?

cherry-pick #2191

Check List

Tests

  • Unit test

@nolouch
api: make api/version and release version consistent (tikv#2191)
4875131 
Signed-off-by: nolouch <nolouch@gmail.com>
@nolouch nolouch added the component/api HTTP API. label Mar 5, 2020
@nolouch nolouch added this to the v3.0.12 milestone Mar 5, 2020
@nolouch nolouch requested review from disksing and rleungx March 5, 2020 11:35
rleungx
rleungx approved these changes Mar 5, 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

@codecov-io
Copy link

Codecov Report

Merging #2200 into release-3.0 will decrease coverage by 0.25%.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-3.0    #2200      +/-   ##
===============================================
- Coverage        69.92%   69.66%   -0.26%     
===============================================
  Files              171      171              
  Lines            16889    16890       +1     
===============================================
- Hits             11810    11767      -43     
- Misses            4122     4152      +30     
- Partials           957      971      +14
Impacted Files Coverage Δ
server/api/version.go 100% <100%> (ø) ⬆️
server/api/status.go 100% <100%> (ø) ⬆️
server/schedulers/shuffle_hot_region.go 58.97% <0%> (-6.42%) ⬇️
server/region_syncer/client.go 81.57% <0%> (-3.95%) ⬇️
server/namespace_cluster.go 81.81% <0%> (-3.9%) ⬇️
server/leader.go 78.75% <0%> (-3.75%) ⬇️
server/util.go 72.61% <0%> (-2.55%) ⬇️
server/grpc_service.go 58.38% <0%> (-1.7%) ⬇️
client/client.go 71.81% <0%> (-1.26%) ⬇️
server/cluster.go 81.72% <0%> (-0.51%) ⬇️
... and 5 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 e2e550a...4875131. Read the comment docs.

@rleungx rleungx added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 5, 2020
@nolouch
Copy link
Contributor Author

nolouch commented Mar 6, 2020

/merge

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

sre-bot commented Mar 6, 2020

Your auto merge job has been accepted, waiting for 2201

@sre-bot
Copy link
Contributor

sre-bot commented Mar 6, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 6, 2020

@nolouch merge failed.

@nolouch
Copy link
Contributor Author

nolouch commented Mar 6, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 6, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 6, 2020

@nolouch merge failed.

@nolouch
Copy link
Contributor Author

nolouch commented Mar 9, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 9, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Mar 9, 2020

@nolouch merge failed.

@nolouch
Copy link
Contributor Author

nolouch commented Mar 9, 2020

/run-all-tests tidb=release-3.0 tikv=release-3.0

@nolouch
Copy link
Contributor Author

nolouch commented Mar 9, 2020

/rebuild tidb=release-3.0 tikv=release-3.0

@nolouch
Copy link
Contributor Author

nolouch commented Mar 9, 2020

/run-all-tests tidb=release-3.0 tikv=release-3.0

1 similar comment
@nolouch
Copy link
Contributor Author

nolouch commented Mar 10, 2020

/run-all-tests tidb=release-3.0 tikv=release-3.0

@nolouch
Copy link
Contributor Author

nolouch commented Mar 10, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Mar 10, 2020

/run-all-tests

@sre-bot sre-bot merged commit 94bb17c into tikv:release-3.0 Mar 10, 2020
@nolouch nolouch deleted the pick-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

@disksing disksing disksing approved these changes

Assignees
No one assigned
Labels
component/api HTTP API. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
v3.0.12
Development

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