luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #1337 from hashicorp/update-memberlist-deps 

Updated the memberlist dependency
This commit is contained in:
Sean Chittenden 2016-06-21 17:06:19 -07:00 committed by GitHub
parent 0a10873aa6 33d7f0243f
commit 16a80943c7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/hashicorp/memberlist/net.go generated vendored
View File

@ -222,7 +222,9 @@ func (m *Memberlist) handleConn(conn *net.TCPConn) {
conn.SetDeadline(time.Now().Add(m.config.TCPTimeout))
msgType, bufConn, dec, err := m.readTCP(conn)
if err != nil {
m.logger.Printf("[ERR] memberlist: failed to receive: %s %s", err, LogConn(conn))
if err != io.EOF {
m.logger.Printf("[ERR] memberlist: failed to receive: %s %s", err, LogConn(conn))
}
return
}

6
vendor/vendor.json vendored
View File

@ -527,10 +527,10 @@
"revision": "0dc08b1671f34c4250ce212759ebd880f743d883"
},
{
"checksumSHA1": "pWIsEUE53NffjS1goRml43Cvleg=",
"checksumSHA1": "8ytOx52G+38QMK4G194Kl6g6YGY=",
"path": "github.com/hashicorp/memberlist",
"revision": "215aec831f03c9b7c61ac183d3e28fff3c7d3a37",
"revisionTime": "2016-06-04T06:22:06Z"
"revision": "b2053e314b4a87e5f0d2d47aeafd3e03be13da90",
"revisionTime": "2016-06-21T23:59:43Z"
},
{
"path": "github.com/hashicorp/net-rpc-msgpackrpc",