Merge remote-tracking branch 'upstream/master' into simulate-import

Gopkg.toml

@@ -18,14 +18,15 @@
 [[constraint]]
   name = "google.golang.org/grpc"
   source = "https://github.com/grpc/grpc-go.git"
-  version = "1.12.0"
+  version = "=1.12.2"
 
 [[constraint]]
   name = "github.com/chzyer/readline"
   branch = "master"
 
 [[constraint]]
   name = "github.com/pingcap/kvproto"
+  source = "https://github.com/pingcap/kvproto.git"
   branch = "master"
 
 [[constraint]]
@@ -40,6 +41,10 @@
   name = "github.com/pkg/errors"
   version = ">= 0.8.0"
 
+[[constraint]]
+  name = "github.com/pingcap/errcode"
+  version = ">= 0.1.0"
+
 [[override]]
   name = "github.com/BurntSushi/toml"
   revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"

Makefile

@@ -28,7 +28,7 @@ all: dev
 
 dev: build check test
 
-ci: build check basic_test
+ci: build check basic-test
 
 build:
 ifeq ("$(WITH_RACE)", "1")
@@ -46,7 +46,7 @@ test: retool-setup
 	CGO_ENABLED=1 go test -race -cover $(TEST_PKGS) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 
-basic_test:
+basic-test:
 	@$(GOFAIL_ENABLE)
 	go test $(BASIC_TEST_PKGS) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
@@ -103,6 +103,11 @@ endif
 simulator:
 	CGO_ENABLED=0 go build -o bin/pd-simulator tools/pd-simulator/main.go
 
+clean-test:
+	rm -rf /tmp/test_pd*
+	rm -rf /tmp/pd-integration-test*
+	rm -rf /tmp/test_etcd*
+
 gofail-enable:
 	# Converting gofail failpoints...
 	@$(GOFAIL_ENABLE)

docs/development.md

@@ -42,5 +42,5 @@ Consider that raml2html depends on various npm packages and can only be run unde
 
 ## Error responses
 
-Error responses from the server are switching to using [error codes](../pkg/error_code/error_code.go).
+Error responses from the server are switching to using [errcode codes](https://github.com/pingcap/errcode).
 The should use the `errorResp` function. Please look at other places in the codebase that use `errorResp`.