From 26adfd7675a56e03f9fd8fca8c0e025c62113786 Mon Sep 17 00:00:00 2001 From: glkappe Date: Wed, 18 Aug 2021 16:08:00 +0800 Subject: [PATCH 1/2] Adjust --comments position (#1522) --- components/playground/playground.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/playground/playground.go b/components/playground/playground.go index 74663a08e2..b97bc49cae 100644 --- a/components/playground/playground.go +++ b/components/playground/playground.go @@ -460,7 +460,7 @@ func (p *Playground) handleScaleOut(w io.Writer, cmd *Command) error { addr := p.tidbs[len(p.tidbs)-1].Addr() if checkDB(addr, cmd.UpTimeout) { ss := strings.Split(addr, ":") - connectMsg := "To connect new added TiDB: mysql --host %s --port %s -u root -p (no password) --comments" + connectMsg := "To connect new added TiDB: mysql --comments --host %s --port %s -u root -p (no password)" fmt.Println(color.GreenString(connectMsg, ss[0], ss[1])) fmt.Fprintln(w, color.GreenString(connectMsg, ss[0], ss[1])) } @@ -884,7 +884,7 @@ func (p *Playground) bootCluster(ctx context.Context, env *environment.Environme fmt.Println(color.GreenString("CLUSTER START SUCCESSFULLY, Enjoy it ^-^")) for _, dbAddr := range succ { ss := strings.Split(dbAddr, ":") - connectMsg := "To connect TiDB: mysql --host %s --port %s -u root -p (no password) --comments" + connectMsg := "To connect TiDB: mysql --comments --host %s --port %s -u root -p (no password)" fmt.Println(color.GreenString(connectMsg, ss[0], ss[1])) } } From 8f4dc5dd94c81e2634411825d17f76b190d045d6 Mon Sep 17 00:00:00 2001 From: Allen Zhong Date: Thu, 19 Aug 2021 11:33:50 +0800 Subject: [PATCH 2/2] bump version 1.5.5 (#1524) --- CHANGELOG.md | 12 ++++++++++++ pkg/version/version.go | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7692af76fc..d245a7d785 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ TiUP Changelog +## [1.5.5] 2021-08-19 + +### Fixes + +- Fix error when reloading a stopped cluster with `--skip-restart` argument ([#1513](https://github.com/pingcap/tiup/pull/1513), [@AstroProfundis](https://github.com/AstroProfundis)) +- Use absolute path for `sudo` command, to workaround errors on systems where `devtoolset` is enabled ([#1516](https://github.com/pingcap/tiup/pull/1516), [@nexustar](https://github.com/nexustar)) +- Fix custom TiDB port not correctly set in playground ([#1511](https://github.com/pingcap/tiup/pull/1511), [@hecomlilong](https://github.com/hecomlilong)) + +### Improvements + +- Adjust suggested argument order in playground examples ([#1522](https://github.com/pingcap/tiup/pull/1522), [@glkappe](https://github.com/glkappe)) + ## [1.5.4] 2021-08-05 ### Fixes diff --git a/pkg/version/version.go b/pkg/version/version.go index 4a4c494a92..e70476aca6 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -23,7 +23,7 @@ var ( // TiUPVerMinor is the minor version of TiUP TiUPVerMinor = 5 // TiUPVerPatch is the patch version of TiUP - TiUPVerPatch = 4 + TiUPVerPatch = 5 // TiUPVerName is an alternative name of the version TiUPVerName = "tiup" // GitHash is the current git commit hash