From 5b7628cf08b246bb8dd075a28f29e1bd3401eb2d Mon Sep 17 00:00:00 2001 From: yanyiwu Date: Fri, 26 Dec 2014 16:59:53 +0800 Subject: [PATCH] use github.com/golang/protobuf/proto instead of code.google.com/p/goprotobuf/proto --- go/operation/system_message.pb.go | 2 +- go/operation/system_message_test.go | 2 +- go/storage/store.go | 2 +- go/weed/weed_server/master_server_handlers_admin.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go/operation/system_message.pb.go b/go/operation/system_message.pb.go index 9f00dd74d..6f0f974c5 100644 --- a/go/operation/system_message.pb.go +++ b/go/operation/system_message.pb.go @@ -14,7 +14,7 @@ It has these top-level messages: */ package operation -import proto "code.google.com/p/goprotobuf/proto" +import "github.com/golang/protobuf/proto" import math "math" // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/operation/system_message_test.go b/go/operation/system_message_test.go index b5624c258..d18ca49a4 100644 --- a/go/operation/system_message_test.go +++ b/go/operation/system_message_test.go @@ -5,7 +5,7 @@ import ( "log" "testing" - proto "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" ) func TestSerialDeserial(t *testing.T) { diff --git a/go/storage/store.go b/go/storage/store.go index e1d9d2b01..65eed1d0e 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - proto "code.google.com/p/goprotobuf/proto" "github.com/chrislusf/weed-fs/go/glog" "github.com/chrislusf/weed-fs/go/operation" "github.com/chrislusf/weed-fs/go/util" + "github.com/golang/protobuf/proto" ) const ( diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index d7124e567..75e059365 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -8,12 +8,12 @@ import ( "strconv" "strings" - proto "code.google.com/p/goprotobuf/proto" "github.com/chrislusf/weed-fs/go/glog" "github.com/chrislusf/weed-fs/go/operation" "github.com/chrislusf/weed-fs/go/storage" "github.com/chrislusf/weed-fs/go/topology" "github.com/chrislusf/weed-fs/go/util" + "github.com/golang/protobuf/proto" ) func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) {