Merge branch 'master' into develop

cloudfoundry · Sep 29, 2015 · 830760d · 830760d
2 parents a8b79f5 + 3fb1613
commit 830760d
Show file tree

Hide file tree

Showing 24 changed files with 190 additions and 66 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,16 +1,16 @@
 PATH
   remote: agent_client
   specs:
-    agent_client (1.3087.0)
+    agent_client (1.3088.0)
       httpclient (= 2.4.0)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: blobstore_client
   specs:
-    blobstore_client (1.3087.0)
+    blobstore_client (1.3088.0)
       aws-sdk (= 1.60.2)
-      bosh_common (~> 1.3087.0)
+      bosh_common (~> 1.3088.0)
       fog (~> 1.31.0)
       fog-aws (<= 0.1.1)
       httpclient (= 2.4.0)
@@ -19,7 +19,7 @@ PATH
 PATH
   remote: bosh-core
   specs:
-    bosh-core (1.3087.0)
+    bosh-core (1.3088.0)
       gibberish (~> 1.4.0)
       yajl-ruby (~> 1.2.0)
 
@@ -41,16 +41,16 @@ PATH
 PATH
   remote: bosh-director
   specs:
-    bosh-director (1.3087.0)
+    bosh-director (1.3088.0)
       bcrypt-ruby (~> 3.0.1)
-      blobstore_client (~> 1.3087.0)
-      bosh-core (~> 1.3087.0)
-      bosh-director-core (~> 1.3087.0)
-      bosh-registry (~> 1.3087.0)
-      bosh-template (~> 1.3087.0)
+      blobstore_client (~> 1.3088.0)
+      bosh-core (~> 1.3088.0)
+      bosh-director-core (~> 1.3088.0)
+      bosh-registry (~> 1.3088.0)
+      bosh-template (~> 1.3088.0)
       bosh_aws_cpi (= 2.0.2)
-      bosh_common (~> 1.3087.0)
-      bosh_cpi (~> 1.3087.0)
+      bosh_common (~> 1.3088.0)
+      bosh_cpi (~> 1.3088.0)
       bosh_openstack_cpi (= 2.0.0)
       bosh_vcloud_cpi (= 0.11.0)
       bosh_vsphere_cpi (= 2.1.0)
@@ -79,14 +79,14 @@ PATH
 PATH
   remote: bosh-director-core
   specs:
-    bosh-director-core (1.3087.0)
-      bosh-template (~> 1.3087.0)
-      bosh_common (~> 1.3087.0)
+    bosh-director-core (1.3088.0)
+      bosh-template (~> 1.3088.0)
+      bosh_common (~> 1.3088.0)
 
 PATH
   remote: bosh-monitor
   specs:
-    bosh-monitor (1.3087.0)
+    bosh-monitor (1.3088.0)
       aws-sdk (= 1.60.2)
       cf-uaa-lib (~> 3.2.1)
       dogapi (~> 1.6.0)
@@ -102,9 +102,9 @@ PATH
 PATH
   remote: bosh-registry
   specs:
-    bosh-registry (1.3087.0)
+    bosh-registry (1.3088.0)
       aws-sdk (= 1.60.2)
-      bosh_cpi (~> 1.3087.0)
+      bosh_cpi (~> 1.3088.0)
       fog (~> 1.31.0)
       fog-aws (<= 0.1.1)
       sequel (~> 3.43.0)
@@ -115,34 +115,34 @@ PATH
 PATH
   remote: bosh-release
   specs:
-    bosh-release (1.3087.0)
-      agent_client (~> 1.3087.0)
-      blobstore_client (~> 1.3087.0)
-      bosh-template (~> 1.3087.0)
-      bosh_common (~> 1.3087.0)
+    bosh-release (1.3088.0)
+      agent_client (~> 1.3088.0)
+      blobstore_client (~> 1.3088.0)
+      bosh-template (~> 1.3088.0)
+      bosh_common (~> 1.3088.0)
       trollop (~> 1.16)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: bosh-stemcell
   specs:
-    bosh-stemcell (1.3087.0)
-      bosh-core (~> 1.3087.0)
+    bosh-stemcell (1.3088.0)
+      bosh-core (~> 1.3088.0)
       bosh_aws_cpi (~> 2.0.0)
 
 PATH
   remote: bosh-template
   specs:
-    bosh-template (1.3087.0)
+    bosh-template (1.3088.0)
       semi_semantic (~> 1.1.0)
 
 PATH
   remote: bosh_cli
   specs:
-    bosh_cli (1.3087.0)
-      blobstore_client (~> 1.3087.0)
-      bosh-template (~> 1.3087.0)
-      bosh_common (~> 1.3087.0)
+    bosh_cli (1.3088.0)
+      blobstore_client (~> 1.3088.0)
+      bosh-template (~> 1.3088.0)
+      bosh_common (~> 1.3088.0)
       cf-uaa-lib (~> 3.2.1)
       highline (~> 1.6.2)
       httpclient (= 2.4.0)
@@ -159,27 +159,27 @@ PATH
 PATH
   remote: bosh_cli_plugin_aws
   specs:
-    bosh_cli_plugin_aws (1.3087.0)
-      bosh-core (~> 1.3087.0)
-      bosh-stemcell (~> 1.3087.0)
+    bosh_cli_plugin_aws (1.3088.0)
+      bosh-core (~> 1.3088.0)
+      bosh-stemcell (~> 1.3088.0)
       bosh_aws_cpi (~> 2.0.0)
-      bosh_cli (~> 1.3087.0)
-      bosh_cli_plugin_micro (~> 1.3087.0)
+      bosh_cli (~> 1.3088.0)
+      bosh_cli_plugin_micro (~> 1.3088.0)
 
 PATH
   remote: bosh_cli_plugin_micro
   specs:
-    bosh_cli_plugin_micro (1.3087.0)
-      agent_client (~> 1.3087.0)
-      blobstore_client (~> 1.3087.0)
-      bosh-core (~> 1.3087.0)
-      bosh-director-core (~> 1.3087.0)
-      bosh-registry (~> 1.3087.0)
-      bosh-stemcell (~> 1.3087.0)
+    bosh_cli_plugin_micro (1.3088.0)
+      agent_client (~> 1.3088.0)
+      blobstore_client (~> 1.3088.0)
+      bosh-core (~> 1.3088.0)
+      bosh-director-core (~> 1.3088.0)
+      bosh-registry (~> 1.3088.0)
+      bosh-stemcell (~> 1.3088.0)
       bosh_aws_cpi (= 2.0.2)
-      bosh_cli (~> 1.3087.0)
-      bosh_common (~> 1.3087.0)
-      bosh_cpi (~> 1.3087.0)
+      bosh_cli (~> 1.3088.0)
+      bosh_common (~> 1.3088.0)
+      bosh_cpi (~> 1.3088.0)
       bosh_openstack_cpi (= 2.0.0)
       bosh_vcloud_cpi (= 0.11.0)
       bosh_vsphere_cpi (= 2.1.0)
@@ -189,22 +189,22 @@ PATH
 PATH
   remote: bosh_common
   specs:
-    bosh_common (1.3087.0)
+    bosh_common (1.3088.0)
       logging (~> 1.8.2)
       semi_semantic (~> 1.1.0)
 
 PATH
   remote: bosh_cpi
   specs:
-    bosh_cpi (1.3087.0)
-      bosh_common (~> 1.3087.0)
+    bosh_cpi (1.3088.0)
+      bosh_common (~> 1.3088.0)
       logging (~> 1.8.2)
       membrane (~> 1.1.0)
 
 PATH
   remote: simple_blobstore_server
   specs:
-    simple_blobstore_server (1.3087.0)
+    simple_blobstore_server (1.3088.0)
       sinatra (~> 1.4.2)
       thin (~> 1.5.0)
 

diff --git a/agent_client/lib/agent_client/version.rb b/agent_client/lib/agent_client/version.rb
@@ -1,7 +1,7 @@
 module Bosh
   module Agent
     class Client
-      VERSION = '1.3087.0'
+      VERSION = '1.3088.0'
     end
   end
 end
diff --git a/blobstore_client/lib/blobstore_client/version.rb b/blobstore_client/lib/blobstore_client/version.rb
@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.3087.0'
+      VERSION = '1.3088.0'
     end
   end
 end
diff --git a/bosh-core/lib/bosh/core/version.rb b/bosh-core/lib/bosh/core/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Core
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-dev/lib/bosh/dev/config/os_image_versions.json b/bosh-dev/lib/bosh/dev/config/os_image_versions.json
@@ -1,5 +1,5 @@
 {
   "bosh-centos-6-os-image.tgz": "kkUYP.4sM_hdsn3Sfcr6ksahFpPgb2D8",
   "bosh-centos-7-os-image.tgz": "43zhprNWRQoYBhDBVkJm6uAocH0IBgLw",
-  "bosh-ubuntu-trusty-os-image.tgz": "Z2u8KpEbHMXu1sYd1lI1VC_RPZGGSYoz"
+  "bosh-ubuntu-trusty-os-image.tgz": "7xLESQCJHkDBRAUr5A6zush.6fZwQ1Dp"
 }
diff --git a/bosh-director-core/lib/bosh/director/core/version.rb b/bosh-director-core/lib/bosh/director/core/version.rb
@@ -1,7 +1,7 @@
 module Bosh
   module Director
     module Core
-      VERSION = '1.3087.0'
+      VERSION = '1.3088.0'
     end
   end
 end
diff --git a/bosh-director/lib/bosh/director/version.rb b/bosh-director/lib/bosh/director/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-monitor/lib/bosh/monitor/version.rb b/bosh-monitor/lib/bosh/monitor/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Monitor
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-registry/lib/bosh/registry/version.rb b/bosh-registry/lib/bosh/registry/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Registry
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-release/lib/bosh/release/version.rb b/bosh-release/lib/bosh/release/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Release
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-stemcell/OS_IMAGES.md b/bosh-stemcell/OS_IMAGES.md
@@ -7,6 +7,9 @@ OS images are stored in S3 bucket [bosh-os-images](http://s3.amazonaws.com/bosh-
 
 Ubuntu 14.04 images have filename `bosh-ubuntu-trusty-os-image.tgz`
 
+* `7xLESQCJHkDBRAUr5A6zush.6fZwQ1Dp`
+  - update kernel for USN-2751-1
+
 * `Z2u8KpEbHMXu1sYd1lI1VC_RPZGGSYoz`
    - add package for growpart command
 

diff --git a/bosh-stemcell/lib/bosh/stemcell/version.rb b/bosh-stemcell/lib/bosh/stemcell/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Stemcell
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh-template/lib/bosh/template/version.rb b/bosh-template/lib/bosh/template/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Template
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh_cli/lib/cli/version.rb b/bosh_cli/lib/cli/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Cli
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh_cli_plugin_aws/lib/bosh_cli_plugin_aws/version.rb b/bosh_cli_plugin_aws/lib/bosh_cli_plugin_aws/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module AwsCliPlugin
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh_cli_plugin_micro/lib/bosh/deployer/version.rb b/bosh_cli_plugin_micro/lib/bosh/deployer/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Deployer
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh_common/lib/common/version.rb b/bosh_common/lib/common/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Common
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/bosh_cpi/lib/cloud/version.rb b/bosh_cpi/lib/cloud/version.rb
@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.3087.0'
+    VERSION = '1.3088.0'
   end
 end
diff --git a/release/.final_builds/packages/director/index.yml b/release/.final_builds/packages/director/index.yml
@@ -824,4 +824,8 @@ builds:
     version: 894f0cf18d9b7ec65dd01c5d5268926f2c21d161
     sha1: 43d8a52d43bda2adce0b52202086f7734bd3cb71
     blobstore_id: e582af23-2a3a-4b15-ae9e-e88b51a5beb7
+  381736db36ebc598a79e2489d349df3f4db1919d:
+    version: 381736db36ebc598a79e2489d349df3f4db1919d
+    sha1: d7b115b9f64c1bf32a1b61a3281118cf6ff51ea2
+    blobstore_id: 09cd682a-3ade-44c0-af69-86c56de8c6c3
 format-version: '2'
diff --git a/release/.final_builds/packages/health_monitor/index.yml b/release/.final_builds/packages/health_monitor/index.yml
@@ -800,4 +800,8 @@ builds:
     version: ac4c961c0dc7031e0fbab962bdcde008cd99b318
     sha1: f878fc0dda6ca44f095bb96215f85f1982bea012
     blobstore_id: 3e957a9f-8bff-426b-9f61-b0da701cd517
+  f0cc9bd33b5fb5e9ee469354b822fbfdc1e9e68f:
+    version: f0cc9bd33b5fb5e9ee469354b822fbfdc1e9e68f
+    sha1: c55d0a390f7773a63628ee36ee6f44f0b74e5fd2
+    blobstore_id: 8ac71802-12a9-4969-a36f-20ef7be5dfcf
 format-version: '2'
diff --git a/release/.final_builds/packages/registry/index.yml b/release/.final_builds/packages/registry/index.yml
@@ -780,4 +780,8 @@ builds:
     version: 8c7f3e9b9d8a0ceda913017478fad6445f434c2c
     sha1: 3387baa6e1a6f4488251b7e01c4f749c920916ed
     blobstore_id: c719ebab-9942-4446-9d4d-e9f9fd832488
+  4121a810fbf3da6033740fc7d4f9f084ececf650:
+    version: 4121a810fbf3da6033740fc7d4f9f084ececf650
+    sha1: d1cb0108e5721b9c757dc5e029f7dc74314cbf66
+    blobstore_id: 28f90910-4c58-48cb-a8c0-17cd681d592d
 format-version: '2'