Merge final release for build 2949 to develop

Gemfile.lock

@@ -8,16 +8,16 @@ GIT
 PATH
   remote: agent_client
   specs:
-    agent_client (1.2941.0)
+    agent_client (1.2949.0)
       httpclient (= 2.4.0)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: blobstore_client
   specs:
-    blobstore_client (1.2941.0)
+    blobstore_client (1.2949.0)
       aws-sdk (= 1.60.2)
-      bosh_common (~> 1.2941.0)
+      bosh_common (~> 1.2949.0)
       fog (~> 1.27.0)
       httpclient (= 2.4.0)
       multi_json (~> 1.1)
@@ -26,7 +26,7 @@ PATH
 PATH
   remote: bosh-core
   specs:
-    bosh-core (1.2941.0)
+    bosh-core (1.2949.0)
       gibberish (~> 1.4.0)
       yajl-ruby (~> 1.2.0)
 
@@ -49,18 +49,18 @@ PATH
 PATH
   remote: bosh-director
   specs:
-    bosh-director (1.2941.0)
+    bosh-director (1.2949.0)
       bcrypt-ruby (~> 3.0.1)
-      blobstore_client (~> 1.2941.0)
-      bosh-core (~> 1.2941.0)
-      bosh-director-core (~> 1.2941.0)
-      bosh-template (~> 1.2941.0)
-      bosh_aws_cpi (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
-      bosh_cpi (~> 1.2941.0)
-      bosh_openstack_cpi (~> 1.2941.0)
+      blobstore_client (~> 1.2949.0)
+      bosh-core (~> 1.2949.0)
+      bosh-director-core (~> 1.2949.0)
+      bosh-template (~> 1.2949.0)
+      bosh_aws_cpi (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
+      bosh_cpi (~> 1.2949.0)
+      bosh_openstack_cpi (~> 1.2949.0)
       bosh_vcloud_cpi (~> 0.7.3)
-      bosh_vsphere_cpi (~> 1.2941.0)
+      bosh_vsphere_cpi (~> 1.2949.0)
       cf-uaa-lib (~> 3.2.1)
       eventmachine (~> 1.0.0)
       fog (~> 1.27.0)
@@ -85,14 +85,14 @@ PATH
 PATH
   remote: bosh-director-core
   specs:
-    bosh-director-core (1.2941.0)
-      bosh-template (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
+    bosh-director-core (1.2949.0)
+      bosh-template (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
 
 PATH
   remote: bosh-monitor
   specs:
-    bosh-monitor (1.2941.0)
+    bosh-monitor (1.2949.0)
       aws-sdk (= 1.60.2)
       dogapi (~> 1.6.0)
       em-http-request (~> 0.3.0)
@@ -106,9 +106,9 @@ PATH
 PATH
   remote: bosh-registry
   specs:
-    bosh-registry (1.2941.0)
+    bosh-registry (1.2949.0)
       aws-sdk (= 1.60.2)
-      bosh_cpi (~> 1.2941.0)
+      bosh_cpi (~> 1.2949.0)
       fog (~> 1.27.0)
       sequel (~> 3.43.0)
       sinatra (~> 1.4.2)
@@ -118,45 +118,45 @@ PATH
 PATH
   remote: bosh-release
   specs:
-    bosh-release (1.2941.0)
-      agent_client (~> 1.2941.0)
-      blobstore_client (~> 1.2941.0)
-      bosh-template (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
+    bosh-release (1.2949.0)
+      agent_client (~> 1.2949.0)
+      blobstore_client (~> 1.2949.0)
+      bosh-template (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
       trollop (~> 1.16)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: bosh-stemcell
   specs:
-    bosh-stemcell (1.2941.0)
-      bosh-core (~> 1.2941.0)
-      bosh_aws_cpi (~> 1.2941.0)
+    bosh-stemcell (1.2949.0)
+      bosh-core (~> 1.2949.0)
+      bosh_aws_cpi (~> 1.2949.0)
 
 PATH
   remote: bosh-template
   specs:
-    bosh-template (1.2941.0)
+    bosh-template (1.2949.0)
       semi_semantic (~> 1.1.0)
 
 PATH
   remote: bosh_aws_cpi
   specs:
-    bosh_aws_cpi (1.2941.0)
+    bosh_aws_cpi (1.2949.0)
       aws-sdk (= 1.60.2)
-      bosh-registry (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
-      bosh_cpi (~> 1.2941.0)
+      bosh-registry (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
+      bosh_cpi (~> 1.2949.0)
       httpclient (= 2.4.0)
       yajl-ruby (>= 0.8.2)
 
 PATH
   remote: bosh_cli
   specs:
-    bosh_cli (1.2941.0)
-      blobstore_client (~> 1.2941.0)
-      bosh-template (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
+    bosh_cli (1.2949.0)
+      blobstore_client (~> 1.2949.0)
+      bosh-template (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
       cf-uaa-lib (~> 3.2.1)
       highline (~> 1.6.2)
       httpclient (= 2.4.0)
@@ -172,54 +172,54 @@ PATH
 PATH
   remote: bosh_cli_plugin_aws
   specs:
-    bosh_cli_plugin_aws (1.2941.0)
-      bosh-core (~> 1.2941.0)
-      bosh-stemcell (~> 1.2941.0)
-      bosh_aws_cpi (~> 1.2941.0)
-      bosh_cli (~> 1.2941.0)
-      bosh_cli_plugin_micro (~> 1.2941.0)
+    bosh_cli_plugin_aws (1.2949.0)
+      bosh-core (~> 1.2949.0)
+      bosh-stemcell (~> 1.2949.0)
+      bosh_aws_cpi (~> 1.2949.0)
+      bosh_cli (~> 1.2949.0)
+      bosh_cli_plugin_micro (~> 1.2949.0)
 
 PATH
   remote: bosh_cli_plugin_micro
   specs:
-    bosh_cli_plugin_micro (1.2941.0)
-      agent_client (~> 1.2941.0)
-      blobstore_client (~> 1.2941.0)
-      bosh-core (~> 1.2941.0)
-      bosh-director-core (~> 1.2941.0)
-      bosh-registry (~> 1.2941.0)
-      bosh-stemcell (~> 1.2941.0)
-      bosh_aws_cpi (~> 1.2941.0)
-      bosh_cli (~> 1.2941.0)
-      bosh_cpi (~> 1.2941.0)
-      bosh_openstack_cpi (~> 1.2941.0)
+    bosh_cli_plugin_micro (1.2949.0)
+      agent_client (~> 1.2949.0)
+      blobstore_client (~> 1.2949.0)
+      bosh-core (~> 1.2949.0)
+      bosh-director-core (~> 1.2949.0)
+      bosh-registry (~> 1.2949.0)
+      bosh-stemcell (~> 1.2949.0)
+      bosh_aws_cpi (~> 1.2949.0)
+      bosh_cli (~> 1.2949.0)
+      bosh_cpi (~> 1.2949.0)
+      bosh_openstack_cpi (~> 1.2949.0)
       bosh_vcloud_cpi (~> 0.7.3)
-      bosh_vsphere_cpi (~> 1.2941.0)
+      bosh_vsphere_cpi (~> 1.2949.0)
       mono_logger (~> 1.1.0)
       sqlite3 (~> 1.3.7)
 
 PATH
   remote: bosh_common
   specs:
-    bosh_common (1.2941.0)
+    bosh_common (1.2949.0)
       logging (~> 1.8.2)
       semi_semantic (~> 1.1.0)
 
 PATH
   remote: bosh_cpi
   specs:
-    bosh_cpi (1.2941.0)
-      bosh_common (~> 1.2941.0)
+    bosh_cpi (1.2949.0)
+      bosh_common (~> 1.2949.0)
       logging (~> 1.8.2)
       membrane (~> 1.1.0)
 
 PATH
   remote: bosh_openstack_cpi
   specs:
-    bosh_openstack_cpi (1.2941.0)
-      bosh-registry (~> 1.2941.0)
-      bosh_common (~> 1.2941.0)
-      bosh_cpi (~> 1.2941.0)
+    bosh_openstack_cpi (1.2949.0)
+      bosh-registry (~> 1.2949.0)
+      bosh_common (~> 1.2949.0)
+      bosh_cpi (~> 1.2949.0)
       fog (~> 1.27.0)
       httpclient (= 2.4.0)
       membrane (~> 1.1.0)
@@ -228,9 +228,9 @@ PATH
 PATH
   remote: bosh_vsphere_cpi
   specs:
-    bosh_vsphere_cpi (1.2941.0)
-      bosh_common (~> 1.2941.0)
-      bosh_cpi (~> 1.2941.0)
+    bosh_vsphere_cpi (1.2949.0)
+      bosh_common (~> 1.2949.0)
+      bosh_cpi (~> 1.2949.0)
       builder (~> 3.1.4)
       httpclient (= 2.4.0)
       membrane (~> 1.1.0)
@@ -240,7 +240,7 @@ PATH
 PATH
   remote: simple_blobstore_server
   specs:
-    simple_blobstore_server (1.2941.0)
+    simple_blobstore_server (1.2949.0)
       sinatra (~> 1.4.2)
       thin (~> 1.5.0)
 

agent_client/lib/agent_client/version.rb

 module Bosh
   module Agent
     class Client
-      VERSION = '1.2941.0'
+      VERSION = '1.2949.0'
     end
   end
 end

blobstore_client/lib/blobstore_client/version.rb

 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.2941.0'
+      VERSION = '1.2949.0'
     end
   end
 end

bosh-core/lib/bosh/core/version.rb

 module Bosh
   module Core
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-director-core/lib/bosh/director/core/version.rb

 module Bosh
   module Director
     module Core
-      VERSION = '1.2941.0'
+      VERSION = '1.2949.0'
     end
   end
 end

bosh-director/lib/bosh/director/version.rb

 module Bosh
   module Director
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-monitor/lib/bosh/monitor/version.rb

 module Bosh
   module Monitor
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-registry/lib/bosh/registry/version.rb

 module Bosh
   module Registry
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-release/lib/bosh/release/version.rb

 module Bosh
   module Release
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-stemcell/lib/bosh/stemcell/version.rb

 module Bosh
   module Stemcell
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh-template/lib/bosh/template/version.rb

 module Bosh
   module Template
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_aws_cpi/lib/cloud/aws/version.rb

 module Bosh
   module AwsCloud
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_cli/lib/cli/version.rb

 module Bosh
   module Cli
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_cli_plugin_aws/lib/bosh_cli_plugin_aws/version.rb

 module Bosh
   module Aws
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_cli_plugin_micro/lib/bosh/deployer/version.rb

 module Bosh
   module Deployer
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_common/lib/common/version.rb

 module Bosh
   module Common
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_cpi/lib/cloud/version.rb

 module Bosh
   module Clouds
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_openstack_cpi/lib/cloud/openstack/version.rb

@@ -3,6 +3,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end

bosh_vsphere_cpi/lib/cloud/vsphere/version.rb

 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2941.0'
+      VERSION = '1.2949.0'
     end
   end
 end

release/.final_builds/packages/blobstore/index.yml

@@ -596,4 +596,8 @@ builds:
     version: bb7f6cce1a87295cf41e874f6da6209d262d90fb
     sha1: 535547795974a37dbf7f5bd5785ff389caaa5489
     blobstore_id: 8397f175-affe-472e-90ae-09753da55561
+  d68990411f666f36b4d2cac1d0bf80a67b587971:
+    version: d68990411f666f36b4d2cac1d0bf80a67b587971
+    sha1: cd3dd56d8b75351b503af15fd273d107b7426328
+    blobstore_id: e460c253-9fc8-4bc1-8dc9-0ca6a1a8fc97
 format-version: '2'

release/.final_builds/packages/director/index.yml

@@ -624,4 +624,8 @@ builds:
     version: 87b52f9a7b8231b96b398c0edc9bcff9d7cc6c97
     sha1: be2a43ff5d6eff1ae66606fd031ee3d938e3ca57
     blobstore_id: b99a1382-cc6c-4e48-bed9-fb410daa09d1
+  01857daab7e3047ab381bda153bf69b7a3f3931c:
+    version: 01857daab7e3047ab381bda153bf69b7a3f3931c
+    sha1: 03938bae5f4bc94b62b32fdd48a75811029577b9
+    blobstore_id: c67c84af-183f-402c-94f2-b8e90b334ccd
 format-version: '2'

release/.final_builds/packages/health_monitor/index.yml

@@ -600,4 +600,8 @@ builds:
     version: 3c647a69288d991eb556367b47d976eeff873850
     sha1: 6f8209226b1e9243fefd355ec3354392661a30b9
     blobstore_id: 96aa05a6-185d-4f2f-8dab-0157a59eea2b
+  1f2f924709fd294ae42004a6fb48e6c3dab9138e:
+    version: 1f2f924709fd294ae42004a6fb48e6c3dab9138e
+    sha1: 5eb66cb978005623bb739f8bd578b460fc17c9cc
+    blobstore_id: 5bb42903-4ad8-4d72-a29c-5df71bde5512
 format-version: '2'

release/.final_builds/packages/registry/index.yml

@@ -580,4 +580,8 @@ builds:
     version: e91f2afebe77c5cb26b29c13809b2d099868f8df
     sha1: 79446868cc3762e42ec871261c54be7af59b1086
     blobstore_id: 05ea4987-89ad-4caa-9381-c182643a3c13
+  267e1360108e1f7962c02dfa379d07942d3e4f60:
+    version: 267e1360108e1f7962c02dfa379d07942d3e4f60
+    sha1: d8e385a6055f5e8caaf535f203deecfc9a4c8ce0
+    blobstore_id: 269fbe7a-aa7f-4736-9913-692d2c429dde
 format-version: '2'

release/releases/bosh-159.yml

+---
+packages:
+- name: health_monitor
+  version: 1f2f924709fd294ae42004a6fb48e6c3dab9138e
+  fingerprint: 1f2f924709fd294ae42004a6fb48e6c3dab9138e
+  sha1: 5eb66cb978005623bb739f8bd578b460fc17c9cc
+  dependencies:
+  - ruby
+- name: nginx
+  version: 0ccc40df032599285cb16a4f2dfdf324a4a61a26
+  fingerprint: 0ccc40df032599285cb16a4f2dfdf324a4a61a26
+  sha1: 4624f519c5e23dd3d073668e08063fda048a5e40
+  dependencies: []
+- name: genisoimage
+  version: 008d332ba1471bccf9d9aeb64c258fdd4bf76201
+  fingerprint: 008d332ba1471bccf9d9aeb64c258fdd4bf76201
+  sha1: 2acf8da0250db31e762a23756fd0e12cfa947eb9
+  dependencies: []
+- name: registry
+  version: 267e1360108e1f7962c02dfa379d07942d3e4f60
+  fingerprint: 267e1360108e1f7962c02dfa379d07942d3e4f60
+  sha1: d8e385a6055f5e8caaf535f203deecfc9a4c8ce0
+  dependencies:
+  - libpq
+  - mysql
+  - ruby
+- name: ruby
+  version: c28e01e561dd7e1bd4ce44f134970dc9f5d7e8fc
+  fingerprint: c28e01e561dd7e1bd4ce44f134970dc9f5d7e8fc
+  sha1: 112204cf9e35cfc1e5618f131e2854bf5214a9d1
+  dependencies: []
+- name: postgres
+  version: aa7f5b110e8b368eeb8f5dd032e1cab66d8614ce
+  fingerprint: aa7f5b110e8b368eeb8f5dd032e1cab66d8614ce
+  sha1: a85f2a1efa7dff34ab772d67191d23363959276a
+  dependencies: []
+- name: blobstore
+  version: d68990411f666f36b4d2cac1d0bf80a67b587971
+  fingerprint: d68990411f666f36b4d2cac1d0bf80a67b587971
+  sha1: cd3dd56d8b75351b503af15fd273d107b7426328
+  dependencies:
+  - ruby
+- name: director
+  version: 01857daab7e3047ab381bda153bf69b7a3f3931c
+  fingerprint: 01857daab7e3047ab381bda153bf69b7a3f3931c
+  sha1: 03938bae5f4bc94b62b32fdd48a75811029577b9
+  dependencies:
+  - libpq
+  - mysql
+  - ruby
+- name: redis
+  version: 1700dbaacfd8780da866e404bd41b46fb4be5c2f
+  fingerprint: 1700dbaacfd8780da866e404bd41b46fb4be5c2f
+  sha1: 3b90bb18c45afaf3f63769183ae666affe877ae6
+  dependencies: []
+- name: common
+  version: 1324d32dbda40da88aade1e07b226a208602baff
+  fingerprint: 1324d32dbda40da88aade1e07b226a208602baff
+  sha1: 9407d1d3da30ded1e955acfc8899304aa58a0e78
+  dependencies: []
+- name: libpq
+  version: f181aa97dd63567e04d897762f0440fb2bef1517
+  fingerprint: f181aa97dd63567e04d897762f0440fb2bef1517
+  sha1: 60c7c9c52fcafc451aa926c568c4246a7e0b30e3
+  dependencies: []
+- name: powerdns
+  version: 256336d00b1689138490c385c03ad3a8f54b4a9e
+  fingerprint: 256336d00b1689138490c385c03ad3a8f54b4a9e
+  sha1: caedada8f5a0fc37aaf0d816c5bcc428d6579440
+  dependencies: []
+- name: mysql
+  version: e5309aed88f5cc662bc77988a31874461f7c4fb8
+  fingerprint: e5309aed88f5cc662bc77988a31874461f7c4fb8
+  sha1: cc2cb926b6a644d2692700c5ae3bd4f5b84dcb82
+  dependencies: []
+- name: nats
+  version: 6a31c7bb0d5ffa2a9f43c7fd7193193438e20e92
+  fingerprint: 6a31c7bb0d5ffa2a9f43c7fd7193193438e20e92
+  sha1: dee70fef63aa35a0d8e1d8fe730b5596904c4a59
+  dependencies:
+  - ruby
+jobs:
+- name: health_monitor
+  version: c2b27af52bd4b1739512845a7ab75e0d19b782bc
+  fingerprint: c2b27af52bd4b1739512845a7ab75e0d19b782bc
+  sha1: 0e9dc8f432c6d4cfc0fe374f5ba8a65c3d6de9f5
+- name: registry
+  version: 361927dd5c02a2519e21f0100ceea290e3b9bd15
+  fingerprint: 361927dd5c02a2519e21f0100ceea290e3b9bd15
+  sha1: c4df55c47a85a0269755eaa7eec352e4ce821e19
+- name: postgres
+  version: 90e43294de79754e659fc1731f515dc090f922f0
+  fingerprint: 90e43294de79754e659fc1731f515dc090f922f0
+  sha1: cc7c6e1f2427339700641883a46dab8d50bf3429
+- name: blobstore
+  version: 267710c9165f827561b14b020c1181b098df27cf
+  fingerprint: 267710c9165f827561b14b020c1181b098df27cf
+  sha1: b22a7964c3660eaf654442707e998c8afe18b145
+- name: director
+  version: 3f7479cc2653d8b95ee97900e60775594ef7c05b
+  fingerprint: 3f7479cc2653d8b95ee97900e60775594ef7c05b
+  sha1: cb7e5a6de926b988ea888e4ce4507261c0b936d2
+- name: redis
+  version: 47e74cf2dfff0e9d2a467095c4d8048ed07aff8b
+  fingerprint: 47e74cf2dfff0e9d2a467095c4d8048ed07aff8b
+  sha1: 6756b3b435e27ae0c74fe20fffd4f526e092ee69
+- name: powerdns
+  version: 4b65553155f6d3df9d02d06e5cee6d42d128217b
+  fingerprint: 4b65553155f6d3df9d02d06e5cee6d42d128217b
+  sha1: 0c2a75f1d02c3517731b6add320cd1f13bc6620a
+- name: nats
+  version: 6850abe07a70b465a6ff7e2b7c133e07c534f220
+  fingerprint: 6850abe07a70b465a6ff7e2b7c133e07c534f220
+  sha1: 41c0f6ce281c6a89d2ae6c2f43a4fa0e2cddd9e9
+commit_hash: 46bdbc6b
+uncommitted_changes: true
+name: bosh
+version: '159'

release/releases/index.yml

@@ -316,4 +316,6 @@ builds:
     version: '157'
   c349618d-11e2-4cdb-9286-8da52620951d:
     version: '158'
+  9e944111-3908-4def-a928-8a102515881b:
+    version: '159'
 format-version: '2'

simple_blobstore_server/lib/simple_blobstore_server/version.rb

 module Bosh
   module SimpleBlobstoreServer
-    VERSION = '1.2941.0'
+    VERSION = '1.2949.0'
   end
 end