Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated import sources to be github.com and golang.com, removed code.google.com #74

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion consensus/m.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion consensus/m_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package consensus

import (
"code.google.com/p/goprotobuf/proto"
proto "github.com/golang/protobuf/proto"
"fmt"
"net"
)
Expand Down
2 changes: 1 addition & 1 deletion consensus/manager.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions consensus/manager_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion consensus/run.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion consensus/run_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion doc/hacking.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Easy-to-follow instructions are at <http://golang.org/doc/install>.
## Installing Dependencies

If you want to change .proto files, you need to nstall the `protoc`
command (from <http://code.google.com/p/protobuf/>):
command (from <http://github.com/google/protobuf/>):

$ sudo apt-get install protobuf-compiler
(or)
Expand Down
2 changes: 1 addition & 1 deletion doc/proto.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion server/conn.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/msg.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/txn.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion web/web.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down