bosh-director 1.5.0.pre.1116 → 1.5.0.pre.1117

data/lib/bosh/director/package_compiler.rb

@@ -169,7 +169,7 @@ module Bosh::Director
               pool.process { process_task(task) }
             end
 
-            break if !pool.working? && @ready_tasks.empty?
+            break if !pool.working? && (director_job_cancelled? || @ready_tasks.empty?)
             sleep(0.1)
           end
         end
@@ -207,6 +207,7 @@ module Bosh::Director
         end
       end
     end
+    private :compile_packages, :process_task
 
     def compile_package(task)
       package = task.package
@@ -387,6 +388,8 @@ module Bosh::Director
       compiled_package
     end
 
+    private
+
     def director_job_cancelled?
       @director_job && @director_job.task_cancelled?
     end
@@ -414,8 +417,6 @@ module Bosh::Director
       counter
     end
 
-    private
-
     def vm_metadata_updater
       @vm_metadata_updater ||= VmMetadataUpdater.build
     end

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1116'
+    VERSION = '1.5.0.pre.1117'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1116
+  version: 1.5.0.pre.1117
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1116
+        version: 1.5.0.pre.1117
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  663451'
+  bf16f0'
 email: support@cloudfoundry.com
 executables:
 - bosh-director