Merge with master

.final_builds/jobs/consul_agent/index.yml

@@ -152,4 +152,8 @@ builds:
     version: 08ba4e37f2757ec3c94f69167fc96d9af3a12f52
     sha1: d08780272a82316f7a38ac14c01bdc99164edf29
     blobstore_id: 7359f795-1007-45fe-946a-47f8330548d4
+  ff1aaea4462487797bd4982b9022c22e9baec60e:
+    version: ff1aaea4462487797bd4982b9022c22e9baec60e
+    sha1: 48d744d14509054eaa745665d4d2b33fc8d3075b
+    blobstore_id: 20c53db4-084d-423a-82b7-90faa5518c07
 format-version: '2'

.final_builds/packages/acceptance-tests/index.yml

@@ -168,4 +168,8 @@ builds:
     version: 569f5e53f60ac512966dc3543c90084e5f34ab3f
     sha1: 0fe40c563fc74a03a9d7903bdbee6ca562138672
     blobstore_id: 4cb95d56-5eed-4857-baa5-9f63fbc27686
+  30ae7698185e6b8018284229b14868128acf6243:
+    version: 30ae7698185e6b8018284229b14868128acf6243
+    sha1: 6b596820d64cf38b3909cc72625fb9f1420a0a2c
+    blobstore_id: 529c6660-be63-4db9-90a0-f9b9559759ea
 format-version: '2'

.final_builds/packages/confab/index.yml

@@ -204,4 +204,8 @@ builds:
     version: 0d0f4d8d5154cc8f1cb156e76dddb35cb60d72c1
     sha1: 00cac2da0342571f20bcd3fa8fcc0a3921ec823e
     blobstore_id: 5b8e2434-6db5-4741-a88c-15d9223f93b0
+  8d483d4836a38ee283b0e06c37a86bba80443cf9:
+    version: 8d483d4836a38ee283b0e06c37a86bba80443cf9
+    sha1: 46649de077cdaab40ee9364714dade2f1e1762e3
+    blobstore_id: 8208919e-12d6-4c69-b063-e619d8e09282
 format-version: '2'

.final_builds/packages/dnsmasq/index.yml

@@ -0,0 +1,7 @@
+---
+builds:
+  888f45c5ac72fb77c6073ea38bfd39a7b4f8ca12:
+    version: 888f45c5ac72fb77c6073ea38bfd39a7b4f8ca12
+    sha1: 729e9bb45f905987ce64e0c6460629c596e665a8
+    blobstore_id: d68e1dd5-318a-4810-9211-f3ca359db763
+format-version: '2'

releases/consul/consul-116.yml

@@ -0,0 +1,50 @@
+---
+packages:
+- name: acceptance-tests
+  version: 30ae7698185e6b8018284229b14868128acf6243
+  fingerprint: 30ae7698185e6b8018284229b14868128acf6243
+  sha1: 6b596820d64cf38b3909cc72625fb9f1420a0a2c
+  dependencies:
+  - golang1.6
+- name: confab
+  version: 8d483d4836a38ee283b0e06c37a86bba80443cf9
+  fingerprint: 8d483d4836a38ee283b0e06c37a86bba80443cf9
+  sha1: 46649de077cdaab40ee9364714dade2f1e1762e3
+  dependencies:
+  - golang1.6
+- name: consul
+  version: 786f3d52dcbb785f523f3b39b172b9b7e2a9c148
+  fingerprint: 786f3d52dcbb785f523f3b39b172b9b7e2a9c148
+  sha1: d8bcd91f20920bb48c92ebf9c61d26220e5068eb
+  dependencies: []
+- name: dnsmasq
+  version: 888f45c5ac72fb77c6073ea38bfd39a7b4f8ca12
+  fingerprint: 888f45c5ac72fb77c6073ea38bfd39a7b4f8ca12
+  sha1: 729e9bb45f905987ce64e0c6460629c596e665a8
+  dependencies: []
+- name: golang1.6
+  version: 5dd4024894667ba7f647b883bbff25c04960e5c1
+  fingerprint: 5dd4024894667ba7f647b883bbff25c04960e5c1
+  sha1: a70730e3beda20b006b0bc5ef1608266bd59524a
+  dependencies: []
+jobs:
+- name: acceptance-tests
+  version: a1af2d0d97c7bc70b6fe866b60850e8b9d77c5b3
+  fingerprint: a1af2d0d97c7bc70b6fe866b60850e8b9d77c5b3
+  sha1: cb72c937dfc382ab480b8d706089ea3747a3a58d
+- name: consul-test-consumer
+  version: 827e6870ce6cbdebaa81b75fc7cc31b7e10f86f6
+  fingerprint: 827e6870ce6cbdebaa81b75fc7cc31b7e10f86f6
+  sha1: 45ed7d207ff0af7f853e5bb300e0028254ef5db5
+- name: consul_agent
+  version: ff1aaea4462487797bd4982b9022c22e9baec60e
+  fingerprint: ff1aaea4462487797bd4982b9022c22e9baec60e
+  sha1: 48d744d14509054eaa745665d4d2b33fc8d3075b
+license:
+  version: 03c513f94198bc667f3ce8e6267e8b3f03b34c73
+  fingerprint: 03c513f94198bc667f3ce8e6267e8b3f03b34c73
+  sha1: 72b67257d5fb0fa4f90fc8863e75d7cd21893669
+commit_hash: 3a78f83a
+uncommitted_changes: true
+name: consul
+version: '116'

releases/consul/index.yml

@@ -230,4 +230,6 @@ builds:
     version: '114'
   e3969bf5-9d7e-4e87-8a63-c3a7cdb3d0cd:
     version: '115'
+  25e8db65-1fa9-4412-94c4-6f03622ebe1c:
+    version: '116'
 format-version: '2'