Merge pull request #5648 from kargakis/godeps

bump(github.com/matttproud/golang_protobuf_extensions/ext)
This commit is contained in:
Vish Kannan 2015-03-19 09:52:35 -07:00
commit 577be8d524
5 changed files with 9 additions and 9 deletions

2
Godeps/Godeps.json generated
View File

@ -310,7 +310,7 @@
}, },
{ {
"ImportPath": "github.com/matttproud/golang_protobuf_extensions/ext", "ImportPath": "github.com/matttproud/golang_protobuf_extensions/ext",
"Rev": "7a864a042e844af638df17ebbabf8183dace556a" "Rev": "ba7d65ac66e9da93a714ca18f6d1bc7a0c09100c"
}, },
{ {
"ImportPath": "github.com/miekg/dns", "ImportPath": "github.com/miekg/dns",

View File

@ -21,8 +21,8 @@ import (
"testing" "testing"
"testing/quick" "testing/quick"
. "code.google.com/p/goprotobuf/proto" . "github.com/golang/protobuf/proto"
. "code.google.com/p/goprotobuf/proto/testdata" . "github.com/golang/protobuf/proto/testdata"
) )
func TestWriteDelimited(t *testing.T) { func TestWriteDelimited(t *testing.T) {

View File

@ -19,7 +19,7 @@ import (
"errors" "errors"
"io" "io"
"code.google.com/p/goprotobuf/proto" "github.com/golang/protobuf/proto"
) )
var errInvalidVarint = errors.New("invalid varint32 encountered") var errInvalidVarint = errors.New("invalid varint32 encountered")

View File

@ -18,7 +18,7 @@ import (
"encoding/binary" "encoding/binary"
"io" "io"
"code.google.com/p/goprotobuf/proto" "github.com/golang/protobuf/proto"
) )
// WriteDelimited encodes and dumps a message to the provided writer prefixed // WriteDelimited encodes and dumps a message to the provided writer prefixed

View File

@ -1,5 +1,5 @@
// Copyright 2010 The Go Authors. All rights reserved. // Copyright 2010 The Go Authors. All rights reserved.
// http://code.google.com/p/goprotobuf/ // http://github.com/golang/protobuf/
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are // modification, are permitted provided that the following conditions are
@ -30,11 +30,11 @@
package ext package ext
import ( import (
. "code.google.com/p/goprotobuf/proto" . "github.com/golang/protobuf/proto"
. "code.google.com/p/goprotobuf/proto/testdata" . "github.com/golang/protobuf/proto/testdata"
) )
// FROM https://code.google.com/p/goprotobuf/source/browse/proto/all_test.go. // FROM https://github.com/golang/protobuf/blob/master/proto/all_test.go.
func initGoTestField() *GoTestField { func initGoTestField() *GoTestField {
f := new(GoTestField) f := new(GoTestField)