Skip to content

Commit

Permalink
*: update dockerfile and fix a make dev error (pingcap#2856)
Browse files Browse the repository at this point in the history
* update Dockerfile because go 1.7 is required
* fix make error
  • Loading branch information
8cbx authored and tiancaiamao committed Mar 17, 2017
1 parent aa92604 commit 52f533b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6
FROM golang:1.7

COPY . /go/src/github.com/pingcap/tidb

Expand Down
2 changes: 1 addition & 1 deletion store/tikv/backoff.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func (b *Backoffer) String() string {
if b.totalSleep == 0 {
return ""
}
return fmt.Sprintf(" backoff(%dms %#s)", b.totalSleep, b.types)
return fmt.Sprintf(" backoff(%dms %s)", b.totalSleep, b.types)
}

// Fork creates a new Backoffer which keeps current Backoffer's sleep time and errors.
Expand Down

0 comments on commit 52f533b

Please sign in to comment.