From f1461ce64d553059007e2fed4a7acf5472596452 Mon Sep 17 00:00:00 2001 From: "yeli.chen" Date: Wed, 16 Mar 2016 11:50:55 +0800 Subject: [PATCH] fix code.google.com libs error --- .travis.yml | 4 ++-- consensus/m.pb.go | 2 +- consensus/m_test.go | 2 +- consensus/manager.go | 2 +- consensus/manager_test.go | 2 +- consensus/run.go | 2 +- consensus/run_test.go | 2 +- doc/hacking.md | 2 +- doc/proto.md | 2 +- server/conn.go | 2 +- server/msg.pb.go | 2 +- server/server_test.go | 2 +- server/txn.go | 2 +- web/web.go | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf9eda9c..36f39a02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: go install: - go get github.com/kr/pretty - go get github.com/bmizerany/assert - - go get code.google.com/p/go.net/websocket - - go get code.google.com/p/goprotobuf/proto + - go get golang.org/x/net/websocket + - go get github.com/golang/protobuf/proto - go get github.com/ha/doozer script: - pushd $TRAVIS_BUILD_DIR diff --git a/consensus/m.pb.go b/consensus/m.pb.go index 35d02345..1cc24acb 100644 --- a/consensus/m.pb.go +++ b/consensus/m.pb.go @@ -4,7 +4,7 @@ package consensus -import proto "code.google.com/p/goprotobuf/proto" +import proto "github.com/golang/protobuf/proto" import json "encoding/json" import math "math" diff --git a/consensus/m_test.go b/consensus/m_test.go index cb8b5344..7f7b4bad 100644 --- a/consensus/m_test.go +++ b/consensus/m_test.go @@ -1,8 +1,8 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" "fmt" + "github.com/golang/protobuf/proto" "net" ) diff --git a/consensus/manager.go b/consensus/manager.go index b14f944d..4eb5f5ea 100644 --- a/consensus/manager.go +++ b/consensus/manager.go @@ -1,8 +1,8 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" "container/heap" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/store" "log" "net" diff --git a/consensus/manager_test.go b/consensus/manager_test.go index 5c4bd28c..070c04d7 100644 --- a/consensus/manager_test.go +++ b/consensus/manager_test.go @@ -1,9 +1,9 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" "container/heap" "github.com/bmizerany/assert" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/store" "net" "sort" diff --git a/consensus/run.go b/consensus/run.go index 37a4e069..2fe7f213 100644 --- a/consensus/run.go +++ b/consensus/run.go @@ -1,8 +1,8 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" "container/heap" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/store" "log" "math/rand" diff --git a/consensus/run_test.go b/consensus/run_test.go index 60826f66..59dd836e 100644 --- a/consensus/run_test.go +++ b/consensus/run_test.go @@ -1,8 +1,8 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" "github.com/bmizerany/assert" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/store" "net" "testing" diff --git a/doc/hacking.md b/doc/hacking.md index 6d574e3d..fc952468 100644 --- a/doc/hacking.md +++ b/doc/hacking.md @@ -15,7 +15,7 @@ Easy-to-follow instructions are at . ## Installing Dependencies If you want to change .proto files, you need to nstall the `protoc` -command (from ): +command (from ): $ sudo apt-get install protobuf-compiler (or) diff --git a/doc/proto.md b/doc/proto.md index 7a9f9a47..9578658a 100644 --- a/doc/proto.md +++ b/doc/proto.md @@ -211,6 +211,6 @@ Error codes are defined with the following meanings: Error value 0 is reserved. -[protobuf]: http://code.google.com/p/protobuf/ +[protobuf]: http://github.com/golang/protobuf/ [9P]: http://plan9.bell-labs.com/magic/man2html/5/intro [data]: data-model.md diff --git a/server/conn.go b/server/conn.go index 43949f6f..01ffa002 100644 --- a/server/conn.go +++ b/server/conn.go @@ -1,8 +1,8 @@ package server import ( - "code.google.com/p/goprotobuf/proto" "encoding/binary" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/consensus" "github.com/ha/doozerd/store" "io" diff --git a/server/msg.pb.go b/server/msg.pb.go index 75e5311b..b49b8c31 100644 --- a/server/msg.pb.go +++ b/server/msg.pb.go @@ -4,7 +4,7 @@ package server -import proto "code.google.com/p/goprotobuf/proto" +import proto "github.com/golang/protobuf/proto" import json "encoding/json" import math "math" diff --git a/server/server_test.go b/server/server_test.go index 91a784a8..aeccb5c3 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -2,8 +2,8 @@ package server import ( "bytes" - "code.google.com/p/goprotobuf/proto" "github.com/bmizerany/assert" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/store" "io" diff --git a/server/txn.go b/server/txn.go index 990a50d3..65b716c1 100644 --- a/server/txn.go +++ b/server/txn.go @@ -1,7 +1,7 @@ package server import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "github.com/ha/doozerd/consensus" "github.com/ha/doozerd/store" "io" diff --git a/web/web.go b/web/web.go index 5fe6d523..1ceae3cc 100644 --- a/web/web.go +++ b/web/web.go @@ -1,9 +1,9 @@ package web import ( - "code.google.com/p/go.net/websocket" "encoding/json" "github.com/ha/doozerd/store" + "golang.org/x/net/websocket" "io" "log" "net"