Merge with master

.final_builds/jobs/consul_agent/index.yml

@@ -168,4 +168,8 @@ builds:
     version: 00ac6050a03ea7a0afe6f986659d54f38bbefedc
     sha1: 4dee6ab48f17a96758cc322870d4e4e4f2248f35
     blobstore_id: 572cd835-fb2d-4d95-a9f9-2d51c39de377
+  0e40ece502c204d15c057dd9542e545a1c69d459:
+    version: 0e40ece502c204d15c057dd9542e545a1c69d459
+    sha1: 1d1e48e641a05cce4256b6961b8b56fe5b5f7629
+    blobstore_id: c6c403fd-36be-412c-88b5-bdbfcd20bf29
 format-version: '2'

releases/consul/consul-122.yml

@@ -0,0 +1,45 @@
+---
+packages:
+- name: acceptance-tests
+  version: 6f8b4db22935a08bee102151a31622a9afe554c4
+  fingerprint: 6f8b4db22935a08bee102151a31622a9afe554c4
+  sha1: ee3f00712acefb12a982d68812d3ebdb82b24028
+  dependencies:
+  - golang1.6
+- name: confab
+  version: 4f0843c64fc642efcf1cc8b360c3f8643688d7e6
+  fingerprint: 4f0843c64fc642efcf1cc8b360c3f8643688d7e6
+  sha1: 6f373564083f7ce80806f8c80a0301a8271c523f
+  dependencies:
+  - golang1.6
+- name: consul
+  version: 786f3d52dcbb785f523f3b39b172b9b7e2a9c148
+  fingerprint: 786f3d52dcbb785f523f3b39b172b9b7e2a9c148
+  sha1: d8bcd91f20920bb48c92ebf9c61d26220e5068eb
+  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: 0e40ece502c204d15c057dd9542e545a1c69d459
+  fingerprint: 0e40ece502c204d15c057dd9542e545a1c69d459
+  sha1: 1d1e48e641a05cce4256b6961b8b56fe5b5f7629
+license:
+  version: 03c513f94198bc667f3ce8e6267e8b3f03b34c73
+  fingerprint: 03c513f94198bc667f3ce8e6267e8b3f03b34c73
+  sha1: 72b67257d5fb0fa4f90fc8863e75d7cd21893669
+commit_hash: 93e2eff3
+uncommitted_changes: true
+name: consul
+version: '122'

releases/consul/index.yml

@@ -242,4 +242,6 @@ builds:
     version: '120'
   40167745-3a56-4d57-b26f-27ceb8aa6983:
     version: '121'
+  e1da7e3e-1184-454d-8628-974c662da022:
+    version: '122'
 format-version: '2'