From fb480469d145d06736d1d180bacaa284b9323b1b Mon Sep 17 00:00:00 2001 From: 33N <3ericn@gmail.com> Date: Thu, 14 May 2015 04:40:57 -0700 Subject: [PATCH 1/3] updated imports to use github and golang.com instead of code.google.com --- .travis.yml | 4 ++-- consensus/m.pb.go | 2 +- consensus/m_test.go | 2 +- consensus/manager.go | 2 +- consensus/manager_test.go | 4 ++-- 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, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf9eda9c..0b195f70 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 github.com/gorilla/websocket + - go get github.com/golang/protobuf - 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..4e23a852 100644 --- a/consensus/m_test.go +++ b/consensus/m_test.go @@ -1,7 +1,7 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" + proto "github.com/golang/protobuf/proto" "fmt" "net" ) diff --git a/consensus/manager.go b/consensus/manager.go index b14f944d..56e2c68a 100644 --- a/consensus/manager.go +++ b/consensus/manager.go @@ -1,7 +1,7 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "container/heap" "github.com/ha/doozerd/store" "log" diff --git a/consensus/manager_test.go b/consensus/manager_test.go index 5c4bd28c..a9b0900b 100644 --- a/consensus/manager_test.go +++ b/consensus/manager_test.go @@ -1,7 +1,7 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "container/heap" "github.com/bmizerany/assert" "github.com/ha/doozerd/store" @@ -14,7 +14,7 @@ import ( // The first element in a protobuf stream is always a varint. // The high bit of a varint byte indicates continuation; // This is a continuation bit without a subsequent byte. -// http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints. +// http://developers.google.com/protocol-buffers/docs/encoding.html#varints. var invalidProtobuf = []byte{0x80} func mustMarshal(p proto.Message) []byte { diff --git a/consensus/run.go b/consensus/run.go index 37a4e069..83b75f7c 100644 --- a/consensus/run.go +++ b/consensus/run.go @@ -1,7 +1,7 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "container/heap" "github.com/ha/doozerd/store" "log" diff --git a/consensus/run_test.go b/consensus/run_test.go index 60826f66..42e08f8d 100644 --- a/consensus/run_test.go +++ b/consensus/run_test.go @@ -1,7 +1,7 @@ package consensus import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "github.com/bmizerany/assert" "github.com/ha/doozerd/store" "net" diff --git a/doc/hacking.md b/doc/hacking.md index 6d574e3d..f4fd513a 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..2d9c7daa 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/google/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..9d742815 100644 --- a/server/conn.go +++ b/server/conn.go @@ -1,7 +1,7 @@ package server import ( - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "encoding/binary" "github.com/ha/doozerd/consensus" "github.com/ha/doozerd/store" 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..e78a53af 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -2,7 +2,7 @@ package server import ( "bytes" - "code.google.com/p/goprotobuf/proto" + "github.com/golang/protobuf/proto" "github.com/bmizerany/assert" "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" From c0c64c1a51775f7f290e851e8326482f78e1743c Mon Sep 17 00:00:00 2001 From: 33N <3ericn@gmail.com> Date: Thu, 14 May 2015 04:55:58 -0700 Subject: [PATCH 2/3] fixing websocket import install to point to golang.com --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b195f70..7b4a4dc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: go install: - go get github.com/kr/pretty - go get github.com/bmizerany/assert - - go get github.com/gorilla/websocket + - go get golang.org/x/net/websocket - go get github.com/golang/protobuf - go get github.com/ha/doozer script: From b06857e3cefb6a197437909fa8eff6ca7dfde9cd Mon Sep 17 00:00:00 2001 From: 33N <3ericn@gmail.com> Date: Thu, 14 May 2015 05:08:30 -0700 Subject: [PATCH 3/3] fixing protobuf import install to point to github.com/golang/protobuf/proto --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7b4a4dc2..36f39a02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ install: - go get github.com/kr/pretty - go get github.com/bmizerany/assert - go get golang.org/x/net/websocket - - go get github.com/golang/protobuf + - go get github.com/golang/protobuf/proto - go get github.com/ha/doozer script: - pushd $TRAVIS_BUILD_DIR