From e1ec8497a4d89f58eb920983bef2197b11ee3ab3 Mon Sep 17 00:00:00 2001 From: iamqizhao Date: Fri, 6 Feb 2015 15:17:54 -0800 Subject: [PATCH] Fix the broken imports due to imgration to grpc --- rpc/call.go | 6 ------ rpc/clientconn.go | 5 ----- rpc/interop/client/client.go | 6 ------ rpc/interop/server/server.go | 6 ------ rpc/interop/testdata/test_proto_grpc.pb.go | 4 ---- rpc/rpc_util.go | 6 ------ rpc/rpc_util_test.go | 5 ----- rpc/server.go | 6 ------ rpc/stream.go | 6 ------ rpc/test/end2end_test.go | 8 -------- rpc/test/testdata/test_grpc.pb.go | 4 ---- rpc/transport/http2_client_transport.go | 6 ------ rpc/transport/http2_server_transport.go | 5 ----- rpc/transport/http_util.go | 5 ----- rpc/transport/transport.go | 6 ------ rpc/transport/transport_test.go | 5 ----- 16 files changed, 89 deletions(-) diff --git a/rpc/call.go b/rpc/call.go index f33e278d..c8abda7d 100644 --- a/rpc/call.go +++ b/rpc/call.go @@ -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" ) diff --git a/rpc/clientconn.go b/rpc/clientconn.go index b2996660..358e5df6 100644 --- a/rpc/clientconn.go +++ b/rpc/clientconn.go @@ -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" ) diff --git a/rpc/interop/client/client.go b/rpc/interop/client/client.go index c7e02bc9..4562c352 100644 --- a/rpc/interop/client/client.go +++ b/rpc/interop/client/client.go @@ -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" ) diff --git a/rpc/interop/server/server.go b/rpc/interop/server/server.go index e3c01d86..30f0e780 100644 --- a/rpc/interop/server/server.go +++ b/rpc/interop/server/server.go @@ -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" ) diff --git a/rpc/interop/testdata/test_proto_grpc.pb.go b/rpc/interop/testdata/test_proto_grpc.pb.go index 6eeb06b8..9d9a57ac 100644 --- a/rpc/interop/testdata/test_proto_grpc.pb.go +++ b/rpc/interop/testdata/test_proto_grpc.pb.go @@ -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" diff --git a/rpc/rpc_util.go b/rpc/rpc_util.go index ba286355..fa72471e 100644 --- a/rpc/rpc_util.go +++ b/rpc/rpc_util.go @@ -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" ) diff --git a/rpc/rpc_util_test.go b/rpc/rpc_util_test.go index 866e79fa..6b3603a4 100644 --- a/rpc/rpc_util_test.go +++ b/rpc/rpc_util_test.go @@ -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" ) diff --git a/rpc/server.go b/rpc/server.go index 7cbd2c75..bac59062 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -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" ) diff --git a/rpc/stream.go b/rpc/stream.go index ff0ad522..d86e10f7 100644 --- a/rpc/stream.go +++ b/rpc/stream.go @@ -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" ) diff --git a/rpc/test/end2end_test.go b/rpc/test/end2end_test.go index 570d7254..f401fd63 100644 --- a/rpc/test/end2end_test.go +++ b/rpc/test/end2end_test.go @@ -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" ) diff --git a/rpc/test/testdata/test_grpc.pb.go b/rpc/test/testdata/test_grpc.pb.go index 3abc1087..618aea5a 100644 --- a/rpc/test/testdata/test_grpc.pb.go +++ b/rpc/test/testdata/test_grpc.pb.go @@ -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" ) diff --git a/rpc/transport/http2_client_transport.go b/rpc/transport/http2_client_transport.go index 35617f3d..7f2bac6b 100644 --- a/rpc/transport/http2_client_transport.go +++ b/rpc/transport/http2_client_transport.go @@ -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" ) diff --git a/rpc/transport/http2_server_transport.go b/rpc/transport/http2_server_transport.go index af6ea44b..39e50133 100644 --- a/rpc/transport/http2_server_transport.go +++ b/rpc/transport/http2_server_transport.go @@ -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" ) diff --git a/rpc/transport/http_util.go b/rpc/transport/http_util.go index 9b07a804..0b6aa74c 100644 --- a/rpc/transport/http_util.go +++ b/rpc/transport/http_util.go @@ -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 ( diff --git a/rpc/transport/transport.go b/rpc/transport/transport.go index 6735ec80..6286f13f 100644 --- a/rpc/transport/transport.go +++ b/rpc/transport/transport.go @@ -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" ) diff --git a/rpc/transport/transport_test.go b/rpc/transport/transport_test.go index 43c79f01..f5e09473 100644 --- a/rpc/transport/transport_test.go +++ b/rpc/transport/transport_test.go @@ -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" )