opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the broken imports due to imgration to grpc

Browse Source
This commit is contained in:
iamqizhao
2015-02-06 15:17:54 -08:00
parent 574bfc16f0
commit e1ec8497a4
16 changed files with 0 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc/call.go
View File

@ -37,15 +37,9 @@ import (
"io"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

5
rpc/clientconn.go
View File

@ -41,13 +41,8 @@ import (
"sync"
"time"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/credentials"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/credentials"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

6
rpc/interop/client/client.go
View File

@ -41,15 +41,9 @@ import (
"strconv"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc"
"github.com/grpc/grpc-go/rpc/credentials"
testpb "github.com/grpc/grpc-go/rpc/interop/testdata"
=======
"github.com/google/grpc-go/rpc"
"github.com/google/grpc-go/rpc/credentials"
testpb "github.com/google/grpc-go/rpc/interop/testdata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

6
rpc/interop/server/server.go
View File

@ -42,15 +42,9 @@ import (
"strconv"
"time"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/credentials"
testpb "github.com/grpc/grpc-go/rpc/interop/testdata"
"github.com/grpc/grpc-go/rpc"
=======
"github.com/google/grpc-go/rpc/credentials"
testpb "github.com/google/grpc-go/rpc/interop/testdata"
"github.com/google/grpc-go/rpc"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
)

4
rpc/interop/testdata/test_proto_grpc.pb.go vendored
View File

@ -35,11 +35,7 @@ package grpc_testing
import (
"fmt"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc"
=======
"github.com/google/grpc-go/rpc"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
proto "github.com/golang/protobuf/proto"
context "golang.org/x/net/context"
"io"

6
rpc/rpc_util.go
View File

@ -43,15 +43,9 @@ import (
"time"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

5
rpc/rpc_util_test.go
View File

@ -42,13 +42,8 @@ import (
"time"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

6
rpc/server.go
View File

@ -43,15 +43,9 @@ import (
"sync"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

6
rpc/stream.go
View File

@ -37,15 +37,9 @@ import (
"io"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
"github.com/grpc/grpc-go/rpc/transport"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
"github.com/google/grpc-go/rpc/transport"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

8
rpc/test/end2end_test.go
View File

@ -47,19 +47,11 @@ import (
"time"
"github.com/golang/protobuf/proto"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc"
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/credentials"
"github.com/grpc/grpc-go/rpc/metadata"
testpb "github.com/grpc/grpc-go/rpc/test/testdata"
=======
"github.com/google/grpc-go/rpc"
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/credentials"
"github.com/google/grpc-go/rpc/metadata"
testpb "github.com/google/grpc-go/rpc/test/testdata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

4
rpc/test/testdata/test_grpc.pb.go vendored
View File

@ -36,11 +36,7 @@ package test
import (
"fmt"
"io"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc"
=======
"github.com/google/grpc-go/rpc"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
context "golang.org/x/net/context"
proto "github.com/golang/protobuf/proto"
)

6
rpc/transport/http2_client_transport.go
View File

@ -44,15 +44,9 @@ import (
"github.com/bradfitz/http2"
"github.com/bradfitz/http2/hpack"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/credentials"
"github.com/grpc/grpc-go/rpc/metadata"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/credentials"
"github.com/google/grpc-go/rpc/metadata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

5
rpc/transport/http2_server_transport.go
View File

@ -45,13 +45,8 @@ import (
"github.com/bradfitz/http2"
"github.com/bradfitz/http2/hpack"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

5
rpc/transport/http_util.go
View File

@ -41,13 +41,8 @@ import (
"github.com/bradfitz/http2"
"github.com/bradfitz/http2/hpack"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/metadata"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/metadata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
)
const (

6
rpc/transport/transport.go
View File

@ -44,15 +44,9 @@ import (
"net"
"sync"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/credentials"
"github.com/grpc/grpc-go/rpc/metadata"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/credentials"
"github.com/google/grpc-go/rpc/metadata"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)

5
rpc/transport/transport_test.go
View File

@ -45,13 +45,8 @@ import (
"testing"
"time"
<<<<<<< HEAD
"github.com/grpc/grpc-go/rpc/codes"
"github.com/grpc/grpc-go/rpc/credentials"
=======
"github.com/google/grpc-go/rpc/codes"
"github.com/google/grpc-go/rpc/credentials"
>>>>>>> 81da9cb2119d434a468b0be62fe3b4bc895be400
"golang.org/x/net/context"
)