Merge branch 'master' into simulate-import

tikv · Oct 10, 2018 · 4d69e23 · 4d69e23
2 parents 5629efc + ef2bdf2
commit 4d69e23
Show file tree

Hide file tree

Showing 122 changed files with 23,285 additions and 1,758 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -26,6 +26,7 @@
 
 [[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"
diff --git a/docs/development.md b/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`.