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

pd-ctl: add topsize command and change the default value of limit to 16 #627

Merged
merged 4 commits into from
Sep 27, 2018
Merged

pd-ctl: add topsize command and change the default value of limit to 16 #627

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd23de9
update the go version
liukun4515 May 9, 2018
841d2bd
solve the conflict
liukun4515 Sep 11, 2018
0c444e7
Merge remote-tracking branch 'upstream/master'
liukun4515 Sep 26, 2018
812f036
add topsize command; change the default value of the limit to 16
liukun4515 Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
solve the conflict
  • Loading branch information
@liukun4515
liukun4515 committed Sep 11, 2018
commit 841d2bd0c40dc561bcc97341601e2e33094e3721
4 changes: 2 additions & 2 deletions scripts/check_requirement.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ fi
# Check go
if which go &>/dev/null; then
# requires go >= 1.8
GO_VER_1=`go version | awk 'match($0, /([0-9])+(\.[0-9])+/) { ver = substr($0, RSTART, RLENGTH); split(ver, n, "."); print n[1];}'`
GO_VER_2=`go version | awk 'match($0, /([0-9])+(\.[0-9])+/) { ver = substr($0, RSTART, RLENGTH); split(ver, n, "."); print n[2];}'`
GO_VER_1=`go version | awk 'match($0, /([0-9])+(\.[0-9]+)+/) { ver = substr($0, RSTART, RLENGTH); split(ver, n, "."); print n[1];}'`
GO_VER_2=`go version | awk 'match($0, /([0-9])+(\.[0-9]+)+/) { ver = substr($0, RSTART, RLENGTH); split(ver, n, "."); print n[2];}'`
if [[ (($GO_VER_1 -eq 1 && $GO_VER_2 -lt 10)) || (($GO_VER_1 -lt 1)) ]]; then
echo "Please upgrade Go to 1.10 or later."
exit 1
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.