Merge branch 'master' of github.com:hashicorp/nomad

hashicorp · Jun 22, 2016 · 3bbf3a5 · 3bbf3a5
2 parents f042c37 + 3b44ddb
commit 3bbf3a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/vendor/github.com/hashicorp/memberlist/net.go b/vendor/github.com/hashicorp/memberlist/net.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -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",