Merge pull request #71 from pingcap/siddontang/update-proto

server: use golang protobuf.
tikv · Apr 7, 2016 · e993dd4 · e993dd4
2 parents 12f2721 + 356181b
commit e993dd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/cluster.go b/server/cluster.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	"github.com/coreos/etcd/clientv3"
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/juju/errors"
 	"github.com/ngaut/log"
 	"github.com/pingcap/kvproto/pkg/metapb"

diff --git a/server/command.go b/server/command.go
@@ -1,7 +1,7 @@
 package server
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/juju/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 )