Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5520 from gyuho/grpc_dep

Browse Source 
vendor: update grpc dependency
This commit is contained in:
Gyu-Ho Lee 2016-06-01 11:43:23 -07:00
commit bea4268a0b
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/Godeps/Godeps.json generated
View File

@ -1,7 +1,7 @@
{
"ImportPath": "github.com/coreos/etcd",
"GoVersion": "go1.6",
"GodepVersion": "v63",
"GodepVersion": "v71",
"Packages": [
"./..."
],
@ -213,39 +213,39 @@
},
{
"ImportPath": "google.golang.org/grpc",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/codes",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/credentials",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/grpclog",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/internal",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/metadata",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/naming",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/peer",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "google.golang.org/grpc/transport",
"Rev": "15e50a43c679d14f4f83a83d3177864cfd751cdd"
"Rev": "8213ee577a465c1f314d85748fb29e4eeed59baf"
},
{
"ImportPath": "gopkg.in/cheggaaa/pb.v1",

4
cmd/vendor/google.golang.org/grpc/server.go generated vendored
View File

@ -257,12 +257,14 @@ func (s *Server) useTransportAuthenticator(rawConn net.Conn) (net.Conn, credenti
// Serve accepts incoming connections on the listener lis, creating a new
// ServerTransport and service goroutine for each. The service goroutines
// read gRPC requests and then call the registered handlers to reply to them.
// Service returns when lis.Accept fails.
// Service returns when lis.Accept fails. lis will be closed when
// this method returns.
func (s *Server) Serve(lis net.Listener) error {
s.mu.Lock()
s.printf("serving")
if s.lis == nil {
s.mu.Unlock()
lis.Close()
return ErrServerStopped
}
s.lis[lis] = true