bosh-director 1.3215.3.0 → 1.3215.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 024dde641fbd1f0b6b6b0481f75469bb7b1d0be9
-  data.tar.gz: b0bb968be959a42def75ae98351143e79e5f2b63
+  metadata.gz: faf6283449ed9e2f917191f99c686b67dca177af
+  data.tar.gz: 53ccfd5747076bf4105787ab11568471ddfbf5cc
 SHA512:
-  metadata.gz: 8d8ddb3554d8594c9adb81d1f219c03c427ede24ae38881b459bf8cefe5e697f680cd529e05935d43f801cd50a565c276bdaf24920aa492ed797681e95747767
-  data.tar.gz: 36c6342f4764fdd858c9493604fce5321449875d288b7d4ce75b14a6a4f6a9c76b4235301945a34fe7b7aecde4b4e706b1fd733c053d9f0f185e18b4652da832
+  metadata.gz: 431bd32c3d55f3f581ea2c068ee69d20c86e49de4645bd758a331fd43e7fc15cd207e854569f2e883e2f82f9cf5e06edfe839141afaa8c1c82ab0b40cc380dc9
+  data.tar.gz: 3ccbba5d34e8b4ba95508c91c13cb741ba241a7aeb25c9faaaef998d70a353182c0ae6fff743c6bb20008d7b3593e8ae37b61e4cd19541aa6a3424342f8f2b0b

data/db/migrations/director/20160210201838_denormalize_compiled_package_stemcell_id_to_stemcell_name_and_version.rb

@@ -23,23 +23,25 @@ Sequel.migration do
       stemcell_foreign_key_name = stemcell_foreign_keys.first.fetch(:name)
 
       build_indexes = indexes(:compiled_packages).select { |_, value| value.fetch(:columns) == [:package_id, :stemcell_id, :build] }
+      raise 'Failed to run migration, found more than 1 build index' if build_indexes.size != 1
+      # build_indexes is an array, where each element is an array with first element being the name of index
+      build_index = build_indexes.first.first
+
+      stemcell_indexes = indexes(:compiled_packages).select { |_, value| value.fetch(:columns) == [:package_id, :stemcell_id, :dependency_key_sha1]}
+      raise 'Failed to run migration, found more than 1 stemcell_id index' if stemcell_indexes.size != 1
+      # stemcell_indexes is an array, where each element is an array with first element being the name of index
+      stemcell_index = stemcell_indexes.first.first
+
       if [:mysql2, :mysql].include?(adapter_scheme)
-        raise 'Failed to run migration, found more than 1 build index' if build_indexes.size != 1
-        # build_indexes is an array, where each element is an array with first element being the name of index
-        build_index = build_indexes.first.first
         alter_table(:compiled_packages) do
           drop_index(nil, name: build_index)
         end
       elsif [:postgres].include?(adapter_scheme)
-        build_index = build_indexes.empty? ? 'compiled_packages_package_id_stemcell_id_build_key' : build_indexes.first.first
         alter_table(:compiled_packages) do
           drop_constraint(build_index)
         end
       end
 
-      stemcell_indexes = indexes(:compiled_packages).select { |_, value| value.fetch(:columns) == [:package_id, :stemcell_id, :dependency_key_sha1]}
-      stemcell_index = stemcell_indexes.empty? ? 'package_stemcell_dependency_key_sha1_idx' : stemcell_indexes.first.first
-
       alter_table(:compiled_packages) do
         drop_constraint(stemcell_foreign_key_name, :type => :foreign_key)
         add_index [:package_id, :stemcell_os, :stemcell_version, :build], unique: true, name: 'package_stemcell_build_idx'

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -371,22 +371,15 @@ module Bosh::Director
 
         redact =  params['redact'] != 'false'
 
-        result = {
-          'context' => {
-            'cloud_config_id' => after_cloud_config ? after_cloud_config.id : nil,
-            'runtime_config_id' => after_runtime_config ? after_runtime_config.id : nil
-          }
-        }
-
-        begin
-          diff = before_manifest.diff(after_manifest, redact)
-          result['diff'] = diff.map { |l| [l.to_s, l.status] }
-        rescue => error
-          result['diff'] = []
-          result['error'] = "Unable to diff manifest: #{error.inspect}\n#{error.backtrace.join("\n")}"
-        end
-
-        json_encode(result)
+        diff = before_manifest.diff(after_manifest, redact)
+
+        json_encode({
+            'context' => {
+              'cloud_config_id' => after_cloud_config ? after_cloud_config.id : nil,
+              'runtime_config_id' => after_runtime_config ? after_runtime_config.id : nil
+            },
+            'diff' => diff.map { |l| [l.to_s, l.status] }
+          })
       end
 
       post '/:deployment/errands/:errand_name/runs' do

data/lib/bosh/director/deployment_plan/update_config.rb

@@ -68,7 +68,7 @@ module Bosh::Director
           'max_in_flight' => @max_in_flight,
           'canary_watch_time' => "#{@min_canary_watch_time}-#{@max_canary_watch_time}",
           'update_watch_time' => "#{@min_update_watch_time}-#{@max_update_watch_time}",
-          'serial' => serial?
+          'serial' => @serial
         }
       end
 

data/lib/bosh/director/jobs/export_release.rb

@@ -1,5 +1,4 @@
 require 'securerandom'
-require 'common/release/release_directory'
 require 'common/version/release_version'
 require 'bosh/director/compiled_release_downloader'
 require 'bosh/director/compiled_release_manifest'
@@ -99,8 +98,7 @@ module Bosh::Director
         output_path = File.join(download_dir, "compiled_release_#{Time.now.to_f}.tar.gz")
         archiver = Core::TarGzipper.new
 
-        release_directory = Bosh::Common::Release::ReleaseDirectory.new(download_dir)
-        archiver.compress(download_dir, release_directory.ordered_release_files, output_path)
+        archiver.compress(download_dir, ['compiled_packages', 'jobs', 'release.MF'], output_path)
         tarball_file = File.open(output_path, 'r')
 
         oid = blobstore_client.create(tarball_file)

data/lib/bosh/director/jobs/release/release_job.rb

@@ -3,12 +3,13 @@ module Bosh::Director
 
     attr_accessor :packages
 
-    def initialize(job_meta, release_model, release_dir, logger)
+    def initialize(job_meta, release_model, release_dir, packages, logger)
       @name = job_meta['name']
       @version = job_meta['version']
       @sha1 = job_meta['sha1']
       @fingerprint = job_meta['fingerprint']
 
+      @packages = packages
       @release_model = release_model
       @release_dir = release_dir
       @logger = logger
@@ -62,8 +63,8 @@ module Bosh::Director
       result = Bosh::Exec.sh("tar -C #{job_dir} -xzf #{job_tgz} 2>&1", :on_error => :return)
       if result.failed?
         @logger.error("Extracting #{desc} archive failed in dir #{job_dir}, " +
-          "tar returned #{result.exit_status}, " +
-          "output: #{result.output}")
+            "tar returned #{result.exit_status}, " +
+            "output: #{result.output}")
         raise JobInvalidArchive, "Extracting #{desc} archive failed. Check task debug log for details."
       end
     end
@@ -108,10 +109,24 @@ module Bosh::Director
     end
 
     def parse_package_names(job_manifest)
-      if job_manifest['packages'] && !job_manifest['packages'].is_a?(Array)
-        raise JobInvalidPackageSpec, "Job '#{@name}' has invalid package spec format"
+      package_names = []
+      if job_manifest['packages']
+        unless job_manifest['packages'].is_a?(Array)
+          raise JobInvalidPackageSpec,
+            "Job `#{@name}' has invalid package spec format"
+        end
+
+        job_manifest['packages'].each do |package_name|
+          package = @packages[package_name]
+          if package.nil?
+            raise JobMissingPackage,
+              "Job `#{@name}' is referencing " +
+                "a missing package `#{package_name}'"
+          end
+          package_names << package.name
+        end
       end
-      job_manifest['packages'] || []
+      package_names
     end
 
     def validate_logs(job_manifest)
@@ -140,7 +155,7 @@ module Bosh::Director
     def parse_links(links, kind)
       if !links.is_a?(Array)
         raise JobInvalidLinkSpec,
-          "Job '#{@name}' has invalid spec format: '#{kind}' must be an array of hashes with name and type"
+              "Job '#{@name}' has invalid spec format: '#{kind}' must be an array of hashes with name and type"
       end
 
       parsed_links = {}

data/lib/bosh/director/jobs/update_release.rb

@@ -150,6 +150,7 @@ module Bosh::Director
           resolve_package_dependencies(@manifest[@packages_folder])
         end
 
+        @packages = {}
         process_packages(release_dir)
         process_jobs(release_dir)
 
@@ -201,6 +202,7 @@ module Bosh::Director
         new_packages = []
         existing_packages = []
         registered_packages = []
+        packages_existing_from_other_releases = []
 
         @manifest[@packages_folder].each do |package_meta|
           # Checking whether we might have the same bits somewhere (in any release, not just the one being uploaded)
@@ -259,6 +261,7 @@ module Bosh::Director
               end
             end
             new_packages << package_meta
+            packages_existing_from_other_releases << package_meta
           end
         end
 
@@ -274,7 +277,7 @@ module Bosh::Director
             }
           end
           all_package_refs = Array(created_package_refs) | Array(existing_package_refs) | registered_package_refs
-          create_compiled_packages(all_package_refs, release_dir)
+          create_compiled_packages(all_package_refs, release_dir, packages_existing_from_other_releases)
         else
           backfill_source_for_packages(registered_packages, release_dir)
         end
@@ -291,6 +294,7 @@ module Bosh::Director
             logger.info("Adding source for package `#{package_desc}'")
             had_effect |= save_package_source_blob(package, package_meta, release_dir)
             package.save
+            @packages[package.name] = package
           end
         end
 
@@ -360,11 +364,11 @@ module Bosh::Director
           end
         end
 
-        package_refs
+        return package_refs
       end
 
       # @return [boolean] true if at least one job was created; false if the call had no effect.
-      def create_compiled_packages(all_compiled_packages, release_dir)
+      def create_compiled_packages(all_compiled_packages, release_dir, packages_existing_from_other_releases)
         return false if all_compiled_packages.nil?
 
         event_log.begin_stage('Creating new compiled packages', all_compiled_packages.size)
@@ -383,7 +387,7 @@ module Bosh::Director
           if existing_compiled_packages.empty?
             package_desc = "#{package.name}/#{package.version} for #{stemcell_os}/#{stemcell_version}"
             event_log.track(package_desc) do
-              other_compiled_packages = compiled_packages_matching(package, stemcell)
+              other_compiled_packages = compiled_packages_matching(package, packages_existing_from_other_releases, stemcell)
               if @fix
                 other_compiled_packages.each do |other_compiled_package|
                   fix_compiled_package(other_compiled_package, compiled_pkg_tgz)
@@ -394,6 +398,7 @@ module Bosh::Director
             end
           elsif @fix
             existing_compiled_package = existing_compiled_packages.first
+            @packages[existing_compiled_package.name] = existing_compiled_package
             fix_compiled_package(existing_compiled_package, compiled_pkg_tgz)
           end
         end
@@ -401,12 +406,16 @@ module Bosh::Director
         had_effect
       end
 
-      def compiled_packages_matching(package, stemcell)
+      def compiled_packages_matching(package, packages_existing_from_other_releases, stemcell)
         other_compiled_packages = []
         dependency_key = dependency_key(package)
-        packages = Models::Package.where(fingerprint: package.fingerprint).all
-        packages.each do |pkg|
-          other_compiled_packages.concat(find_compiled_packages(pkg.id, stemcell[:os], stemcell[:version], dependency_key).all)
+        packages_existing_from_other_releases.each do |other_package_meta|
+          if other_package_meta["fingerprint"] == package.fingerprint
+            packages = Models::Package.where(fingerprint: other_package_meta["fingerprint"]).all
+            packages.each do |pkg|
+              other_compiled_packages.concat(find_compiled_packages(pkg.id, stemcell[:os], stemcell[:version], dependency_key).all)
+            end
+          end
         end
         other_compiled_packages
       end
@@ -520,6 +529,7 @@ module Bosh::Director
       # @param [Models::Package] package Package model
       # @return [void]
       def register_package(package)
+        @packages[package.name] = package
         @release_version_model.add_package(package)
       end
 
@@ -581,7 +591,7 @@ module Bosh::Director
       end
 
       def create_job(job_meta, release_dir)
-        release_job = ReleaseJob.new(job_meta, @release_model, release_dir, logger)
+        release_job = ReleaseJob.new(job_meta, @release_model, release_dir, @packages, logger)
         logger.info("Creating job template `#{job_meta['name']}/#{job_meta['version']}' " +
             'from provided bits')
         release_job.update(Models::Template.new())
@@ -598,7 +608,7 @@ module Bosh::Director
 
             if @fix
               logger.info("Fixing existing job `#{job_desc}'")
-              release_job = ReleaseJob.new(job_meta, @release_model, release_dir, logger)
+              release_job = ReleaseJob.new(job_meta, @release_model, release_dir, @packages, logger)
               release_job.update(template)
             else
               logger.info("Using existing job `#{job_desc}'")

data/lib/bosh/director/manifest/changeset.rb

@@ -1,21 +1,24 @@
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    self.merge(second, &merger)
+  end
+end
+
 module Bosh::Director
   class Changeset
     KEY_NAME = 'name'
 
-    REDACT_KEY_NAMES = %w(
-      properties
-      bosh
-    )
-
-    def initialize(before, after, redacted_before = nil, redacted_after = nil)
-      @redacted_before = redacted_before.nil? ? Changeset.redact_properties!(Bosh::Common::DeepCopy.copy(before)) : redacted_before
-      @redacted_after = redacted_after.nil? ? Changeset.redact_properties!(Bosh::Common::DeepCopy.copy(after)) : redacted_after
+    def initialize(before, after, redact = true, redacted_before = nil, redacted_after = nil)
+      @redact = redact
+      @redacted_before = redacted_before.nil? ? Redactor.redact_properties(Bosh::Common::DeepCopy.copy(before), redact) : redacted_before
+      @redacted_after = redacted_after.nil? ? Redactor.redact_properties(Bosh::Common::DeepCopy.copy(after), redact) : redacted_after
 
       @before = before
       @after = after
 
       if @before && @after
-        @merged = deep_merge(@before, @after)
+        @merged = @before.deep_merge(@after)
       elsif @before
         @merged = @before
       else
@@ -23,113 +26,64 @@ module Bosh::Director
       end
     end
 
-    # redacts properties from ruby object to avoid having to use a regex to redact properties from diff output
-    # please do not use regexes for diffing/redacting
-    def self.redact_properties!(obj, redact_key_is_ancestor = false)
-      if redact_key_is_ancestor
-        if obj.respond_to?(:key?)
-          obj.keys.each{ |key|
-            if obj[key].respond_to?(:each)
-              redact_properties!(obj[key], true)
-            else
-              obj[key] = '<redacted>'
-            end
-          }
-        elsif obj.respond_to?(:each_index)
-          obj.each_index { |i|
-            if obj[i].respond_to?(:each)
-              redact_properties!(obj[i], true)
-            else
-              obj[i] = '<redacted>'
-            end
-          }
-        end
-      else
-        if obj.respond_to?(:each)
-          obj.each{ |a|
-            if obj.respond_to?(:key?) && REDACT_KEY_NAMES.any? { |key| key == a.first } && a.last.respond_to?(:key?)
-              redact_properties!(a.last, true)
-            else
-              redact_properties!(a.respond_to?(:last) ? a.last : a)
-            end
-
-          }
-        end
-      end
-
-      obj
-    end
-
-    def diff(redact=true, indent = 0)
+    def diff(indent = 0)
       lines = DiffLines.new
 
-      if redact
-        output_values_before = @redacted_before
-        output_values_after = @redacted_after
-      else
-        output_values_before = @before
-        output_values_after = @after
-      end
-
       @merged.each_pair do |key, value|
-        if @before[key] != @after[key]
-          if @before.nil? || @before[key].nil?
-            lines.concat(yaml_lines({key => output_values_after[key]}, indent, 'added'))
-
-          elsif @after.nil? || @after[key].nil?
-            lines.concat(yaml_lines({key => output_values_before[key]}, indent, 'removed'))
-
-          elsif @before[key].is_a?(Array) && @after[key].is_a?(Array)
-            lines.concat(compare_arrays(@before[key], @after[key], output_values_before[key], output_values_after[key], key, redact, indent))
-
-          elsif @before[key].is_a?(Hash) && @after[key].is_a?(Hash)
-            changeset = Changeset.new(@before[key], @after[key], output_values_before[key], output_values_after[key])
-            diff_lines = changeset.diff(redact, indent+1)
-            unless diff_lines.empty?
-              lines << Line.new(indent, "#{key}:", nil)
-              lines.concat(diff_lines)
-            end
+        if @before.nil? || @before[key].nil?
+          lines.concat(yaml_lines({key => @redacted_after[key]}, indent, 'added'))
 
-          else
-            lines.concat(yaml_lines({key => output_values_before[key]}, indent, 'removed'))
-            lines.concat(yaml_lines({key => output_values_after[key]}, indent, 'added'))
+        elsif @after.nil? || @after[key].nil?
+          lines.concat(yaml_lines({key => @redacted_before[key]}, indent, 'removed'))
+
+        elsif @before[key].is_a?(Array) && @after[key].is_a?(Array)
+          lines.concat(compare_arrays(@before[key], @after[key], @redacted_before[key], @redacted_after[key], key, indent))
+
+        elsif value.is_a?(Hash)
+          changeset = Changeset.new(@before[key], @after[key],@redact, @redacted_before[key], @redacted_after[key])
+          diff_lines = changeset.diff(indent+1)
+          unless diff_lines.empty?
+            lines << Line.new(indent, "#{key}:", nil)
+            lines.concat(diff_lines)
           end
+
+        elsif @before[key] != @after[key]
+          lines.concat(yaml_lines({key => @redacted_before[key]}, indent, 'removed'))
+          lines.concat(yaml_lines({key => @redacted_after[key]}, indent, 'added'))
         end
       end
       lines
     end
 
-    private
-
-    def deep_merge(first, second)
-      merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
-      first.merge(second, &merger)
-    end
-
     def yaml_lines(value, indent, state)
       lines = DiffLines.new
-      value.to_yaml(indent: Line::INDENT).gsub(/^---\n/, '').split("\n").each do |line|
+      value.to_yaml(indent: Line::INDENT).gsub("---\n", '').split("\n").each do |line|
         lines << Line.new(indent, line, state)
       end
       lines
     end
 
-    def compare_arrays(old_value, new_value, output_old_value, output_new_value, parent_name, redact, indent)
+    def compare_arrays(old_value, new_value, redacted_old_value, redacted_new_value, parent_name, indent)
       # combine arrays of redacted and unredacted values. unredacted arrays for diff logic, and redacted arrays for output
-      combined_old_value = old_value.zip output_old_value
-      combined_new_value = new_value.zip output_new_value
+      combined_old_value = old_value.zip redacted_old_value
+      combined_new_value = new_value.zip redacted_new_value
+
       added = combined_new_value - combined_old_value
       removed = combined_old_value - combined_new_value
 
       lines = DiffLines.new
 
       added.each do |pair|
+
         elem = pair.first
         redacted_elem = pair.last
+
         if elem.is_a?(Hash)
           using_names = (added+removed).all? { |e| e.first['name'] }
+
           using_ranges = (added+removed).all? { |e| e.first['range'] }
           if using_names || using_ranges
+            #clean up duplicate values
             if using_names
               removed_same_name_element = removed.find { |e| e.first['name'] == elem['name'] }
             elsif using_ranges
@@ -138,8 +92,8 @@ module Bosh::Director
             removed.delete(removed_same_name_element)
 
             if removed_same_name_element
-              changeset = Changeset.new(removed_same_name_element.first, elem, removed_same_name_element.last, redacted_elem)
-              diff_lines = changeset.diff(redact, indent+1)
+              changeset = Changeset.new(removed_same_name_element.first, elem, @redact, removed_same_name_element.last, redacted_elem)
+              diff_lines = changeset.diff(indent+1)
 
               unless diff_lines.empty?
                 # write name if elem has been changed

data/lib/bosh/director/manifest/manifest.rb

@@ -33,7 +33,7 @@ module Bosh::Director
     end
 
     def diff(other_manifest, redact)
-      Changeset.new(to_hash, other_manifest.to_hash).diff(redact).order
+      Changeset.new(to_hash, other_manifest.to_hash, redact).diff.order
     end
 
     def to_hash

data/lib/bosh/director/models/release_version.rb

@@ -12,9 +12,7 @@ module Bosh::Director::Models
     end
 
     def package_by_name(package_name)
-      packages_by_name.fetch(package_name) do
-        raise "Package name '#{package_name}' not found in release '#{release.name}/#{version}'"
-      end
+      packages_by_name.fetch(package_name)
     end
 
     private

data/lib/bosh/director/validation_helper.rb

@@ -35,7 +35,7 @@ module Bosh::Director
                 "'#{property}' value (#{result.inspect}) should be less than #{options[:max].inspect}"
         end
 
-      elsif options.has_key?(:default)
+      elsif options[:default]
         result = options[:default]
 
       elsif !options[:optional]

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3215.3.0'
+    VERSION = '1.3215.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3215.3.0
+  version: 1.3215.4.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.3.0
+        version: 1.3215.4.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -681,8 +681,6 @@ files:
 - db/migrations/director/20160219175840_add_column_teams_to_deployments.rb
 - db/migrations/director/20160224222508_add_deployment_name_to_task.rb
 - db/migrations/director/20160225182206_rename_post_start_completed.rb
-- db/migrations/director/20160329201256_set_instances_with_nil_serial_to_false.rb
-- db/migrations/director/20160331225404_backfill_stemcell_os.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb

data/db/migrations/director/20160329201256_set_instances_with_nil_serial_to_false.rb

@@ -1,15 +0,0 @@
-require 'json'
-
-Sequel.migration do
-  up do
-    self[:instances].all do |instance|
-      unless instance[:spec_json].nil?
-        spec = JSON.parse(instance[:spec_json])
-        if !spec['update'].nil? && spec['update'].has_key?('serial') && spec['update']['serial'].nil?
-          spec['update']['serial'] = false
-          self[:instances].where(id: instance[:id]).update(spec_json: JSON.generate(spec))
-        end
-      end
-    end
-  end
-end

data/db/migrations/director/20160331225404_backfill_stemcell_os.rb

@@ -1,9 +0,0 @@
-Sequel.migration do
-  up do
-    self[:stemcells].all do |stemcell|
-      if stemcell[:operating_system].nil? || stemcell[:operating_system] == ''
-        self[:stemcells].where(id: stemcell[:id]).update(operating_system: stemcell[:name])
-      end
-    end
-  end
-end