Merge branch 'master' into zimuxia/domain-reload

pingcap · Nov 21, 2016 · 1432c16 · 1432c16
2 parents 6aa69b5 + af5b0e7
commit 1432c16
Show file tree

Hide file tree

Showing 68 changed files with 3,250 additions and 2,200 deletions.
diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/coprocessor/coprocessor.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/coprocessor/coprocessor.pb.go
diff --git a/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go b/_vendor/src/github.com/pingcap/kvproto/pkg/eraftpb/eraftpb.pb.go