Merge branch 'master' into develop

Signed-off-by: Danny Berger <[email protected]>
mingxiao · Aug 30, 2016 · 6f0b20e · 6f0b20e
2 parents 3e7d904 + cc49a8e
commit 6f0b20e
Show file tree

Hide file tree

Showing 22 changed files with 192 additions and 65 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,23 +1,23 @@
 PATH
   remote: agent_client
   specs:
-    agent_client (1.3262.0)
+    agent_client (1.3262.9.0)
       httpclient (= 2.7.1)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: blobstore_client
   specs:
-    blobstore_client (1.3262.0)
+    blobstore_client (1.3262.9.0)
       aws-sdk-resources (= 2.2.0)
-      bosh_common (~> 1.3262.0)
+      bosh_common (~> 1.3262.9.0)
       httpclient (= 2.7.1)
       multi_json (~> 1.1)
 
 PATH
   remote: bosh-core
   specs:
-    bosh-core (1.3262.0)
+    bosh-core (1.3262.9.0)
       gibberish (~> 1.4.0)
       yajl-ruby (~> 1.2.0)
 
@@ -39,23 +39,23 @@ PATH
 PATH
   remote: bosh-director-core
   specs:
-    bosh-director-core (1.3262.0)
-      bosh-template (~> 1.3262.0)
-      bosh_common (~> 1.3262.0)
+    bosh-director-core (1.3262.9.0)
+      bosh-template (~> 1.3262.9.0)
+      bosh_common (~> 1.3262.9.0)
 
 PATH
   remote: bosh-director
   specs:
-    bosh-director (1.3262.0)
+    bosh-director (1.3262.9.0)
       bcrypt-ruby (~> 3.0.1)
-      blobstore_client (~> 1.3262.0)
-      bosh-core (~> 1.3262.0)
-      bosh-director-core (~> 1.3262.0)
-      bosh-registry (~> 1.3262.0)
-      bosh-template (~> 1.3262.0)
+      blobstore_client (~> 1.3262.9.0)
+      bosh-core (~> 1.3262.9.0)
+      bosh-director-core (~> 1.3262.9.0)
+      bosh-registry (~> 1.3262.9.0)
+      bosh-template (~> 1.3262.9.0)
       bosh_aws_cpi (= 2.1.1)
-      bosh_common (~> 1.3262.0)
-      bosh_cpi (~> 1.3262.0)
+      bosh_common (~> 1.3262.9.0)
+      bosh_cpi (~> 1.3262.9.0)
       bosh_openstack_cpi (= 2.1.3)
       bosh_vcloud_cpi (= 0.12.1)
       bosh_vsphere_cpi (= 2.1.1)
@@ -82,7 +82,7 @@ PATH
 PATH
   remote: bosh-monitor
   specs:
-    bosh-monitor (1.3262.0)
+    bosh-monitor (1.3262.9.0)
       aws-sdk (= 1.60.2)
       cf-uaa-lib (~> 3.2.1)
       dogapi (~> 1.21.0)
@@ -99,9 +99,9 @@ PATH
 PATH
   remote: bosh-registry
   specs:
-    bosh-registry (1.3262.0)
+    bosh-registry (1.3262.9.0)
       aws-sdk
-      bosh_cpi (~> 1.3262.0)
+      bosh_cpi (~> 1.3262.9.0)
       fog-openstack
       sequel (~> 4.32.0)
       sinatra (~> 1.4.2)
@@ -111,51 +111,51 @@ PATH
 PATH
   remote: bosh-release
   specs:
-    bosh-release (1.3262.0)
-      agent_client (~> 1.3262.0)
-      blobstore_client (~> 1.3262.0)
-      bosh-template (~> 1.3262.0)
-      bosh_common (~> 1.3262.0)
+    bosh-release (1.3262.9.0)
+      agent_client (~> 1.3262.9.0)
+      blobstore_client (~> 1.3262.9.0)
+      bosh-template (~> 1.3262.9.0)
+      bosh_common (~> 1.3262.9.0)
       trollop (~> 1.16)
       yajl-ruby (~> 1.2.0)
 
 PATH
   remote: bosh-stemcell
   specs:
-    bosh-stemcell (1.3262.0)
-      bosh-core (~> 1.3262.0)
+    bosh-stemcell (1.3262.9.0)
+      bosh-core (~> 1.3262.9.0)
       bosh_aws_cpi (= 2.1.1)
 
 PATH
   remote: bosh-template
   specs:
-    bosh-template (1.3262.0)
+    bosh-template (1.3262.9.0)
       semi_semantic (~> 1.2.0)
 
 PATH
   remote: bosh_cli_plugin_aws
   specs:
-    bosh_cli_plugin_aws (1.3262.0)
-      bosh-core (~> 1.3262.0)
-      bosh-stemcell (~> 1.3262.0)
+    bosh_cli_plugin_aws (1.3262.9.0)
+      bosh-core (~> 1.3262.9.0)
+      bosh-stemcell (~> 1.3262.9.0)
       bosh_aws_cpi (= 2.1.1)
-      bosh_cli (~> 1.3262.0)
-      bosh_cli_plugin_micro (~> 1.3262.0)
+      bosh_cli (~> 1.3262.9.0)
+      bosh_cli_plugin_micro (~> 1.3262.9.0)
 
 PATH
   remote: bosh_cli_plugin_micro
   specs:
-    bosh_cli_plugin_micro (1.3262.0)
-      agent_client (~> 1.3262.0)
-      blobstore_client (~> 1.3262.0)
-      bosh-core (~> 1.3262.0)
-      bosh-director-core (~> 1.3262.0)
-      bosh-registry (~> 1.3262.0)
-      bosh-stemcell (~> 1.3262.0)
+    bosh_cli_plugin_micro (1.3262.9.0)
+      agent_client (~> 1.3262.9.0)
+      blobstore_client (~> 1.3262.9.0)
+      bosh-core (~> 1.3262.9.0)
+      bosh-director-core (~> 1.3262.9.0)
+      bosh-registry (~> 1.3262.9.0)
+      bosh-stemcell (~> 1.3262.9.0)
       bosh_aws_cpi (= 2.1.1)
-      bosh_cli (~> 1.3262.0)
-      bosh_common (~> 1.3262.0)
-      bosh_cpi (~> 1.3262.0)
+      bosh_cli (~> 1.3262.9.0)
+      bosh_common (~> 1.3262.9.0)
+      bosh_cpi (~> 1.3262.9.0)
       bosh_openstack_cpi (= 2.1.3)
       bosh_vcloud_cpi (= 0.12.1)
       bosh_vsphere_cpi (= 2.1.1)
@@ -166,10 +166,10 @@ PATH
 PATH
   remote: bosh_cli
   specs:
-    bosh_cli (1.3262.0)
-      blobstore_client (~> 1.3262.0)
-      bosh-template (~> 1.3262.0)
-      bosh_common (~> 1.3262.0)
+    bosh_cli (1.3262.9.0)
+      blobstore_client (~> 1.3262.9.0)
+      bosh-template (~> 1.3262.9.0)
+      bosh_common (~> 1.3262.9.0)
       cf-uaa-lib (~> 3.2.1)
       highline (~> 1.6.2)
       httpclient (= 2.7.1)
@@ -186,22 +186,22 @@ PATH
 PATH
   remote: bosh_common
   specs:
-    bosh_common (1.3262.0)
+    bosh_common (1.3262.9.0)
       logging (~> 1.8.2)
       semi_semantic (~> 1.2.0)
 
 PATH
   remote: bosh_cpi
   specs:
-    bosh_cpi (1.3262.0)
-      bosh_common (~> 1.3262.0)
+    bosh_cpi (1.3262.9.0)
+      bosh_common (~> 1.3262.9.0)
       logging (~> 1.8.2)
       membrane (~> 1.1.0)
 
 PATH
   remote: simple_blobstore_server
   specs:
-    simple_blobstore_server (1.3262.0)
+    simple_blobstore_server (1.3262.9.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.3262.0'
+      VERSION = '1.3262.9.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.3262.0'
+      VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.0'
   end
 end
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.3262.0'
+      VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.0'
   end
 end
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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.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.3262.0'
+    VERSION = '1.3262.9.0'
   end
 end
diff --git a/release/.final_builds/packages/director/index.yml b/release/.final_builds/packages/director/index.yml
@@ -1092,4 +1092,8 @@ builds:
     version: 63d986882df2533324e1611ba544ee3b02c25133
     sha1: 9059e056612abcf3feef397d37a72fc2429e2930
     blobstore_id: 848bfad3-a10c-44bd-bcd9-10d43b905c3f
+  0f1b09ec6bb28ea13d2e919e71dd7ccd8ab49313:
+    version: 0f1b09ec6bb28ea13d2e919e71dd7ccd8ab49313
+    sha1: bde46c6329fcecd10214fb7d22e51e2ec782fc48
+    blobstore_id: c83497a9-ab7f-4ccc-ad3a-85bf058af7cb
 format-version: '2'
diff --git a/release/.final_builds/packages/health_monitor/index.yml b/release/.final_builds/packages/health_monitor/index.yml
@@ -1068,4 +1068,8 @@ builds:
     version: 62b635f04783c2d07b0e5a50eadcae5d48b2883c
     sha1: aaeb5f0398359723f827f6a80a2e8c636862fc5d
     blobstore_id: d7d6e1e8-9cbb-4fa2-87bb-9f40d4423d87
+  f7f8cc73eebc6e21ebf3ba9c834959d692fcc54d:
+    version: f7f8cc73eebc6e21ebf3ba9c834959d692fcc54d
+    sha1: d1eab1307e84667d31003e8e539025b2d50f54b7
+    blobstore_id: 2a6c1014-a1a1-4894-872f-b4fa8c3627da
 format-version: '2'
diff --git a/release/.final_builds/packages/registry/index.yml b/release/.final_builds/packages/registry/index.yml
@@ -1048,4 +1048,8 @@ builds:
     version: ed95450e34ff3eae080f27a576a19b3060b3f6c2
     sha1: b45ddb42e7c0f23af74b467bf191435476824236
     blobstore_id: f025b802-60cd-4a68-bd4c-00cab3f6cd3f
+  3aa0993cb8739fd4f5c6fc1e0da8e1cfdf6df247:
+    version: 3aa0993cb8739fd4f5c6fc1e0da8e1cfdf6df247
+    sha1: 5bb21040b6a74b0cf99b08f9cfbd548b5f0509ea
+    blobstore_id: 62cd9b62-dcb1-4d81-8c33-f8981a5b6065
 format-version: '2'