Merge remote-tracking branch 'master-repo/master' into HEAD

.final_builds/jobs/gorouter/index.yml

@@ -71,6 +71,10 @@ builds:
     version: 87a92e1e1fde00bc0de237551dbf60e7204fa0ca
     blobstore_id: 9cb72b0c-00e5-4c5f-90b0-2cac5b5129b4
     sha1: 8519a0d8186fc25e7602bbf73f622f4b8874e660
+  8c9288bf0f69b27f80baaa7957d0c906510d699eb68c6d035d4bbfd69c5aa4db:
+    version: 8c9288bf0f69b27f80baaa7957d0c906510d699eb68c6d035d4bbfd69c5aa4db
+    blobstore_id: 89034056-8489-463c-4876-4c2e22f9f214
+    sha1: sha256:3249355effa1155ac9e4c9c4b58a7f44a3e8a7c3bca14a1301d58e37ef91e843
   8f23d4d36c7bb87f8e2155a93a1dee17baaf804d:
     version: 8f23d4d36c7bb87f8e2155a93a1dee17baaf804d
     blobstore_id: 254ed14f-0d45-4ecf-96ce-c7bdbd9f8dbc

.final_builds/jobs/route_registrar/index.yml

@@ -11,6 +11,10 @@ builds:
     version: 4067fe87e3105a1dceb79f656a13311d1bc90e8f
     blobstore_id: ccac398c-337d-474a-9a26-ea54c9b68696
     sha1: 20cf163c36004aae3d17a4d3ba9ab5c25c1a6e72
+  5ead717cc46e53bef4cd8d6fa40c2f126a671500f23225fc8820417bef003978:
+    version: 5ead717cc46e53bef4cd8d6fa40c2f126a671500f23225fc8820417bef003978
+    blobstore_id: 41b81a05-a6ad-40dd-67f3-5c756f34683c
+    sha1: sha256:689a80528c39dfe57cff42089b43e6fb4bb036ba2cf6f57d09a8f38cebe3295a
   63fc9c9db78d205638973a5d645a31adba0e6cb9:
     version: 63fc9c9db78d205638973a5d645a31adba0e6cb9
     blobstore_id: 8b8d79f0-2094-44ed-83ef-d92204c80eab

.final_builds/jobs/routing-api/index.yml

@@ -91,4 +91,8 @@ builds:
     version: cacf4daaeb935cf0f5dc6967d3246422ba4f582b
     blobstore_id: f86d0240-23f3-4120-b6c9-e6aaaf9f0ba5
     sha1: 4b24a6a71787c58bd38eba29621d893b7f83bad2
+  f137e05ef427e417e81ae34a91946a655de184f1871cc6b88b018e0eed2873a8:
+    version: f137e05ef427e417e81ae34a91946a655de184f1871cc6b88b018e0eed2873a8
+    blobstore_id: a79a659b-24cc-4d63-7ee9-73fce8098686
+    sha1: sha256:996d9c987c56a1bf1461f052bec96a14ccdbaf1dad8bee9e3d4e313777bcc3ee
 format-version: "2"

.final_builds/jobs/tcp_router/index.yml

@@ -27,6 +27,10 @@ builds:
     version: c8ba8ed129c93d4329a2acbe42938624103d5e73
     blobstore_id: 64838dda-7eab-4f82-bfbb-4d3649d239a5
     sha1: c9179d3b3aa47d38afe85c756505eea9fe34aa40
+  d6ab8c88e41d6af5e642d93b7043c59dfa46fbe52f95fb75802a2bb252535ce9:
+    version: d6ab8c88e41d6af5e642d93b7043c59dfa46fbe52f95fb75802a2bb252535ce9
+    blobstore_id: 8b2c5670-d4cb-47a0-4898-32a562860b77
+    sha1: sha256:5ab5a7d986d45efe1f4756338195475f6419901b04a803807c837d9fd64031c1
   db115a94140b395086f75e09e47905c67a83b079:
     version: db115a94140b395086f75e09e47905c67a83b079
     blobstore_id: da8587cc-b135-42d5-b9a7-61f3e354bdf6

.final_builds/packages/acceptance_tests/index.yml

@@ -123,6 +123,10 @@ builds:
     version: b249002ebe8835127161d8917590442b73783a5e
     blobstore_id: ac287f5d-37e0-431e-b9b9-c5a671882ec2
     sha1: c3b479560afb531f299f0b1f832d6a9af53639b3
+  b44493352853c6321b076f9c6dfb02d2f9d387a6e9754baf8e58c12c9fe3757a:
+    version: b44493352853c6321b076f9c6dfb02d2f9d387a6e9754baf8e58c12c9fe3757a
+    blobstore_id: ec638759-1ab4-4b0d-74eb-bcb77add8731
+    sha1: sha256:283633c5f5c0afaa520dd8f14ccca1011895c7ff3aec4ce45a2e1c1887326f60
   b797b50986cf5636ca4dc1deed84318b8c4415fcf52bde0bb76feba1c25a54d0:
     version: b797b50986cf5636ca4dc1deed84318b8c4415fcf52bde0bb76feba1c25a54d0
     blobstore_id: 40978f34-e320-4917-4b4b-853886aabab8

.final_builds/packages/gorouter/index.yml

@@ -195,6 +195,10 @@ builds:
     version: c9704598dc1ea9f9e1d2dcdc65c2c972b5a87215
     blobstore_id: 7c37b8f2-1b7a-49b1-98dd-b74564b02204
     sha1: 90f7d97e54a6a37d605d7dbdc187ec5ce5d19c68
+  cd924f3922934b212d5e096e37fbaca4fe95abe11197cd461b850e4a23d57e80:
+    version: cd924f3922934b212d5e096e37fbaca4fe95abe11197cd461b850e4a23d57e80
+    blobstore_id: 4dac3eac-ff82-47c9-58c0-66a5247e25bb
+    sha1: sha256:7cc8541bce4db019687bfb9f6e22cc6176514790f6b4d42251a0eaabb9ad5a8b
   cde91dd5b3add2e5130b041fea1f8a42dbd735a6:
     version: cde91dd5b3add2e5130b041fea1f8a42dbd735a6
     blobstore_id: 14f7bc56-a702-4098-9520-52a0514ddb1e

.final_builds/packages/route_registrar/index.yml

@@ -7,6 +7,10 @@ builds:
     version: 19f5e326dc285ac4672b60aa78f06e67b9ace0e58a85693dbcbebd63a5a0d30e
     blobstore_id: 34572261-ba2f-405a-78e4-5662eb60f6c7
     sha1: sha256:804fa524e73fca22bad2210f6c1f4a18ce3cddd8c9b26a2e0005eba714cdeb8b
+  2e221dede22f919a265b8ec90323d138787cb81e608fdea8a6f2dd3f941350b8:
+    version: 2e221dede22f919a265b8ec90323d138787cb81e608fdea8a6f2dd3f941350b8
+    blobstore_id: 9e610441-934b-4c20-6589-43e13c9a883f
+    sha1: sha256:df53498b94bb1791c7b1e0e6bff3bf97935aece5d56974ce6aaa5476c0949796
   2ff66bed1ad2faf5dc177c14fb51beb680bf5ca1:
     version: 2ff66bed1ad2faf5dc177c14fb51beb680bf5ca1
     blobstore_id: e0e27bb6-1852-4965-84bc-1c857c25c073

.final_builds/packages/routing-api/index.yml

@@ -79,6 +79,10 @@ builds:
     version: 5f967526f58a8de4b381e2447bb549ff87833d39
     blobstore_id: 9a99a70c-19fa-4d25-8133-9c88c95251d2
     sha1: 9c58342fc70ab83fd6fb61df119564edddeb989a
+  60a5e3122219483c6d5a9848360830542dee864db6342561107a1d949096b251:
+    version: 60a5e3122219483c6d5a9848360830542dee864db6342561107a1d949096b251
+    blobstore_id: 99ad9004-a8f3-427f-6b14-c6463a3a7fb7
+    sha1: sha256:1558db4890e51f5fdb05c25bec5f7263be5e0ef265d3216dc7cb0156fa74bebc
   61480f2558c4ccc43e342eb5168e9120a3a24396:
     version: 61480f2558c4ccc43e342eb5168e9120a3a24396
     blobstore_id: 0d89d252-deae-4a60-bc99-4b6142ccf3d6

.final_builds/packages/routing_utils/index.yml

@@ -35,6 +35,10 @@ builds:
     version: ba119554fd15e7073fbe45f7ca15beeed1e322b02cdf7ec99e1c2948d60fd3f4
     blobstore_id: 6c994931-8166-437d-6a51-ec56954020a6
     sha1: sha256:d62637f700db760083d2e403fe53f86f7b5bb878c3e86e99b4f8741e7a51f086
+  d5fcb8374fe802338f7ee33657d91531e14bdf0a0155e1d42dbbdab43c46b578:
+    version: d5fcb8374fe802338f7ee33657d91531e14bdf0a0155e1d42dbbdab43c46b578
+    blobstore_id: b331c855-c02b-4181-4e39-095a8296c32e
+    sha1: sha256:6b3be147a8136dda847483e44417100c45458b14de6bd9c545249263d0c25464
   ee6362cf2ec3efbb0269e99dcb98606a485a17abb3e749c3039426d7e09f6e97:
     version: ee6362cf2ec3efbb0269e99dcb98606a485a17abb3e749c3039426d7e09f6e97
     blobstore_id: 983487cd-96bd-4c94-7cf9-b34717f458d0

.final_builds/packages/rtr/index.yml

@@ -31,6 +31,10 @@ builds:
     version: a1ea03088c50af7672b57fa3af8004a0a4562f15defcfe8632e736267b07373a
     blobstore_id: 9d38d93c-ac4b-456d-6220-c9c4fad04cec
     sha1: sha256:bb675157fe9bd5c2c53e427365b9686fb6d3eeab4be01d0ac8734feb0cb6095c
+  ac42fa4feb59270f14e6f75d6cf8944c6132467157d9c4ae01e5aee2a0ffd467:
+    version: ac42fa4feb59270f14e6f75d6cf8944c6132467157d9c4ae01e5aee2a0ffd467
+    blobstore_id: 31be06d0-a757-4a3d-7a65-f7c1f31a0016
+    sha1: sha256:aca5a3db7d6528a5c2aafcd3453288b671c5f263b7c621bb288c3f548212ea4c
   ad3491d8fd89e9509310256dce4d08adb89eb7608b0a5420b42169cd69646731:
     version: ad3491d8fd89e9509310256dce4d08adb89eb7608b0a5420b42169cd69646731
     blobstore_id: 7339b7f4-bb8f-40cd-4ec0-1ce0986a1352

.final_builds/packages/tcp_router/index.yml

@@ -43,6 +43,10 @@ builds:
     version: 58fd78c300f9c104fd857b4b062d2b6e08f52da68c6401f75b8fbe162a504226
     blobstore_id: c097044d-ccb4-43dd-4d20-f83f1e84e23a
     sha1: sha256:95fc1ee563ccdefc72c1b83d02fa582cc35cadcaafd7ee2e8da8f4ca04cac783
+  70d5e55d4e8ed0a72570f5e4075740e6c1a5fb541b8bd581b4b20c00932c4104:
+    version: 70d5e55d4e8ed0a72570f5e4075740e6c1a5fb541b8bd581b4b20c00932c4104
+    blobstore_id: 312d1128-ce49-481a-75a5-438bc4de1fd3
+    sha1: sha256:edd3ef530b425176b5f9957f67ff678af5fa9493aaceb1540a82758b2fa70116
   731e35b2463a97b7b960c776fa873f5d444af3d2:
     version: 731e35b2463a97b7b960c776fa873f5d444af3d2
     blobstore_id: bb1a40bc-ba64-4473-9f58-946bdcf65261

.gitmodules

@@ -55,15 +55,6 @@
 [submodule "src/github.com/cloudfoundry/gunk"]
 	path = src/github.com/cloudfoundry/gunk
 	url = https://github.com/cloudfoundry/gunk
-[submodule "src/github.com/cloudfoundry/storeadapter"]
-	path = src/github.com/cloudfoundry/storeadapter
-	url = https://github.com/cloudfoundry/storeadapter
-[submodule "src/github.com/coreos/etcd"]
-	path = src/github.com/coreos/etcd
-	url = https://github.com/coreos/etcd
-[submodule "src/github.com/coreos/go-etcd"]
-	path = src/github.com/coreos/go-etcd
-	url = https://github.com/coreos/go-etcd
 [submodule "src/github.com/dgrijalva/jwt-go"]
 	path = src/github.com/dgrijalva/jwt-go
 	url = https://github.com/dgrijalva/jwt-go

releases/index.yml

@@ -27,6 +27,8 @@ builds:
     version: 0.171.0
   2ef7c68f-43d8-4836-9e09-b52cc575d282:
     version: 0.143.0
+  311b217d-26fa-4e6f-6648-9d18fdf18486:
+    version: 0.189.0
   31a76591-989c-429e-933f-c006607f5655:
     version: 0.145.0
   3a1d5ddd-af8b-4469-91b2-f41f55c6f0c2:

releases/routing-0.189.0.yml

@@ -0,0 +1,95 @@
+name: routing
+version: 0.189.0
+commit_hash: cc0efd5
+uncommitted_changes: false
+jobs:
+- name: acceptance_tests
+  version: 90da9f9e6226d976512801243e1d85e6c43bb89922dd5d70a29f8707af0c2234
+  fingerprint: 90da9f9e6226d976512801243e1d85e6c43bb89922dd5d70a29f8707af0c2234
+  sha1: sha256:8187351c48a868741e9dd16df6d8cacc92289b30f3ef8e34bc6f169c79c6b068
+- name: bbr-routingdb
+  version: 794530916f5308c8baf8cfb5630ec37ac850264ca3d544e31d21fbca4397e3fa
+  fingerprint: 794530916f5308c8baf8cfb5630ec37ac850264ca3d544e31d21fbca4397e3fa
+  sha1: sha256:297b8844514f542aed6cc05de06201206eacb19c02891c2e387c2b98111bec05
+- name: gorouter
+  version: 8c9288bf0f69b27f80baaa7957d0c906510d699eb68c6d035d4bbfd69c5aa4db
+  fingerprint: 8c9288bf0f69b27f80baaa7957d0c906510d699eb68c6d035d4bbfd69c5aa4db
+  sha1: sha256:3249355effa1155ac9e4c9c4b58a7f44a3e8a7c3bca14a1301d58e37ef91e843
+- name: route_registrar
+  version: 5ead717cc46e53bef4cd8d6fa40c2f126a671500f23225fc8820417bef003978
+  fingerprint: 5ead717cc46e53bef4cd8d6fa40c2f126a671500f23225fc8820417bef003978
+  sha1: sha256:689a80528c39dfe57cff42089b43e6fb4bb036ba2cf6f57d09a8f38cebe3295a
+- name: routing-api
+  version: f137e05ef427e417e81ae34a91946a655de184f1871cc6b88b018e0eed2873a8
+  fingerprint: f137e05ef427e417e81ae34a91946a655de184f1871cc6b88b018e0eed2873a8
+  sha1: sha256:996d9c987c56a1bf1461f052bec96a14ccdbaf1dad8bee9e3d4e313777bcc3ee
+- name: smoke_tests
+  version: cc082a4d62756ae3cafb870fcdd79889cd77b15f9579a050195228ee3f10ca50
+  fingerprint: cc082a4d62756ae3cafb870fcdd79889cd77b15f9579a050195228ee3f10ca50
+  sha1: sha256:3d33950f4fa1f4a62b8a0de837916aa7d89910acc5c32b447b756a57b9856600
+- name: tcp_router
+  version: d6ab8c88e41d6af5e642d93b7043c59dfa46fbe52f95fb75802a2bb252535ce9
+  fingerprint: d6ab8c88e41d6af5e642d93b7043c59dfa46fbe52f95fb75802a2bb252535ce9
+  sha1: sha256:5ab5a7d986d45efe1f4756338195475f6419901b04a803807c837d9fd64031c1
+packages:
+- name: acceptance_tests
+  version: b44493352853c6321b076f9c6dfb02d2f9d387a6e9754baf8e58c12c9fe3757a
+  fingerprint: b44493352853c6321b076f9c6dfb02d2f9d387a6e9754baf8e58c12c9fe3757a
+  sha1: sha256:283633c5f5c0afaa520dd8f14ccca1011895c7ff3aec4ce45a2e1c1887326f60
+  dependencies:
+  - rtr
+  - golang-1-linux
+- name: cf-cli-6-linux
+  version: 10012503c843d92be121b3049b12a238de5eced7
+  fingerprint: 10012503c843d92be121b3049b12a238de5eced7
+  sha1: 237335994475c7e25f6062f5017496affd4354ef
+  dependencies: []
+- name: golang-1-linux
+  version: a58647561918778c52fb932074e6099497a9063bce3a1531e5c60ba643e1f4df
+  fingerprint: a58647561918778c52fb932074e6099497a9063bce3a1531e5c60ba643e1f4df
+  sha1: sha256:c6a7f2d5741270ed0fe9582f2ff18902bc0be08bfc61fb682e46deff97368644
+  dependencies: []
+- name: gorouter
+  version: cd924f3922934b212d5e096e37fbaca4fe95abe11197cd461b850e4a23d57e80
+  fingerprint: cd924f3922934b212d5e096e37fbaca4fe95abe11197cd461b850e4a23d57e80
+  sha1: sha256:7cc8541bce4db019687bfb9f6e22cc6176514790f6b4d42251a0eaabb9ad5a8b
+  dependencies:
+  - golang-1-linux
+- name: haproxy
+  version: a573fdd5c50a47c1a649c356beed073e27534ddf5fdd1aea9e8c890eddf83780
+  fingerprint: a573fdd5c50a47c1a649c356beed073e27534ddf5fdd1aea9e8c890eddf83780
+  sha1: sha256:312bc99c9b09fe19fe77eb019dd6a4564e24be5ab144f6cc6ba77679a9adbc2f
+  dependencies: []
+- name: route_registrar
+  version: 2e221dede22f919a265b8ec90323d138787cb81e608fdea8a6f2dd3f941350b8
+  fingerprint: 2e221dede22f919a265b8ec90323d138787cb81e608fdea8a6f2dd3f941350b8
+  sha1: sha256:df53498b94bb1791c7b1e0e6bff3bf97935aece5d56974ce6aaa5476c0949796
+  dependencies:
+  - golang-1-linux
+- name: routing-api
+  version: 60a5e3122219483c6d5a9848360830542dee864db6342561107a1d949096b251
+  fingerprint: 60a5e3122219483c6d5a9848360830542dee864db6342561107a1d949096b251
+  sha1: sha256:1558db4890e51f5fdb05c25bec5f7263be5e0ef265d3216dc7cb0156fa74bebc
+  dependencies:
+  - golang-1-linux
+- name: routing_utils
+  version: d5fcb8374fe802338f7ee33657d91531e14bdf0a0155e1d42dbbdab43c46b578
+  fingerprint: d5fcb8374fe802338f7ee33657d91531e14bdf0a0155e1d42dbbdab43c46b578
+  sha1: sha256:6b3be147a8136dda847483e44417100c45458b14de6bd9c545249263d0c25464
+  dependencies: []
+- name: rtr
+  version: ac42fa4feb59270f14e6f75d6cf8944c6132467157d9c4ae01e5aee2a0ffd467
+  fingerprint: ac42fa4feb59270f14e6f75d6cf8944c6132467157d9c4ae01e5aee2a0ffd467
+  sha1: sha256:aca5a3db7d6528a5c2aafcd3453288b671c5f263b7c621bb288c3f548212ea4c
+  dependencies:
+  - golang-1-linux
+- name: tcp_router
+  version: 70d5e55d4e8ed0a72570f5e4075740e6c1a5fb541b8bd581b4b20c00932c4104
+  fingerprint: 70d5e55d4e8ed0a72570f5e4075740e6c1a5fb541b8bd581b4b20c00932c4104
+  sha1: sha256:edd3ef530b425176b5f9957f67ff678af5fa9493aaceb1540a82758b2fa70116
+  dependencies:
+  - golang-1-linux
+license:
+  version: 10661a06190559379af3f2c99f89d8bacb4ecf6e017ca6b8b6d412110bdba37b
+  fingerprint: 10661a06190559379af3f2c99f89d8bacb4ecf6e017ca6b8b6d412110bdba37b
+  sha1: sha256:b8f7807cd60f9b408b9885e502be6f20d7ec626aec181bc818cc7b432d5e4a63