CRLF
CRLF
Merge remote-tracking branch 'upstream/master'

* upstream/master: (141 commits)
  Improved if_p can chain #else_if_p,  #else methods
  Fix broken unit specs
  Check if ext4 lazy_itable_init is enabled before using it
  Add 'lazy_itable_init' option to mke2fs [fixes #44226189]
  make agent not format the ephemeral disk
  Change property subnet in bat template
  Added RDS options to aws config yml
  Revert 'CI to use single AWS destroy command'
  CI to use single AWS destroy command
  Normalized `bosh aws delete_all` commands [#44112527]
  AWS bootstrap force adds keypairs
  Add echoes to scripts used to create MicroBOSH stemcell to debug failing Jenkins build
  Print and capture output simultaneously in AWS specs
  External specs refactored and set up to use different AWS credentials than the Jenkins VM
  Update README.md
  Update README.md
  Update README.md
  bosh aws destroy [fixes #44112527]
  remove echo's after finish debugging jenkins build
  updated README
  ...
CRLF
Merge branch 'master' of github.com:ankurcha/bosh

* 'master' of github.com:ankurcha/bosh:
  CRLF
Merge remote-tracking branch 'upstream/master'

* upstream/master: (25 commits)
  make AMIs public in CI
  fixed bugs in stemcell creation
  include original config in receipt
  Better message when deleting unnamed instance
  Update BAT README with new BAT environment options
  Support fast failure and skipping SSH tests in BAT via environment variables
  Changed director job template to use new style properties in bosh/release
  updated badges in README
  Don't reuse dns_info_record (fix for recreating jobs)
  use sigar instead of sys-filesystem
  remove trivial whitespace
  Update blobstore_client gemspec for renamed README & example config [fixes #49]
  [finishes #44595437] allocate an extra elastic IP for the DEA in dev/test
  Fix failing bat manifest specs
  example usage of blobstore_client_console
  Convert tabs to whitespace
  Fix spec:system:aws
  AWS script should not remove protected instances resources [fixes #44549997]
  BAT_DNS_HOST is not optional
  fake aws stemcells
  ...
Merge remote-tracking branch 'upstream/master'

* upstream/master: (70 commits)
  bump rds creation timeout to 20 minutes
  create db subnet group as part of rds setup
  add multiple cf subnets to aws unit test assets
  Bosh::Aws::RDS#create_subnet_group
  Bosh::Aws::RDS#subnet_group_exists?
  shellscript can't have spaces around assignments
  change ci stemcell builder to be able to build for all infrastructures
  Don't upload stemcell when NO_PROVISION is set
  Add more options to Bat test
  updated aws-sdk to one that isn't broken
  version bump party
  Use vpc outfile when generating bat manifest
  Added helper to get stemcell version
  Error message was not better, it turns out
  Moving cleanup to beginning of spec instead of after
  Better error logging in vpc deletion
  directory sleeps between HTTP request retries
  signature of aws generate microbosh changed, updating micro_bosh_spec.
  Better vpc error message
  Using the same aws credentials everywhere.
  ...
Merge remote-tracking branch 'upstream/master'

* upstream/master: (93 commits)
  Use /sys/proc/... to get the cdrom device
  [#45112063] - Exec returns an result object not a string, fix expectations accordingly
  Remove placeholder spec accidentally committed
  Use better key for global cache
  Conditionally save compiled packages to global blobstore
  First pass at saving to global blobstore
  [finishes #45168899] AWS bootstrap deploys microbosh from latest CI stemcell
  blobstore client should be able to suggest an object id
  copy global one-ring-key to local path for use by bosh
  CI Publish AMI sends light stemcell to S3
  Catch HTTPClient::ReceiveTimeoutError when waiting for registry to start
  output rds to a consistent file name
  [fixes #45112063] - fix issue with agent startup
  fix stemcell version comparsion when using timestamped stemcells from CI
  Filter for EBS volumes that aren't already deleted or deleting [fixes #45174599]
  support suggesting object id to blobstore server
  [#45168899] Jenkins publishes stemcell AMIs to a well-defined S3 URLs
  [#45168899] AWS bootstrap does micro deploy
  AWS::bootstrap: setting up for a 'no-arg' bosh aws bootstrap micro  command
  Clean up bat dns tests
  ...
Remove unnecessary block device checking
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  CF system spec creates RDS resources first
  fix microbosh system spec vpc/rds outfile paths
  fix microBOSH spec after deployment generator was changed to take two arguments
  enhance cpi tests for aws plugin and error message
  microBOSH system spec creates BAT deployment directory just when needed
  HTTP plays well with a proxy environment
  add retryable functionality to Bosh::Common module
  Move generate_build_number into CompiledPackage, add specs for it
  Added logging for uploading compiled packages to global cache
  Global cache key respects dependent package versions
  No need to check if it is a block device now
  Add some changes to pull request #59
  fix randomly failing aws boostrap cli spec
  move bosh_agent/misc/temcell/uild2 to the top level directory
  Added some tests and made changes to handle \n in the filename if any while searching for cdrom device
  vendor retryable gem
  Add Retryable gem
  added bosh-stemcell-vsphere 0.8.0 (test)
  update stemcell build for 3.0 kernel
  Use if_p in director template so it doesn't blow up when global_blobstore is missing

Conflicts:
	bosh_agent/lib/bosh_agent/infrastructure/vsphere/settings.rb
Merge remote-tracking branch 'upstream/master'

* upstream/master: (21 commits)
  [openstack_cpi] Limit the size of metadata keys and values
  [openstack_cpi] Detect API rate limit exceptions and retry calls [Fixes #45488271]
  Micro deployment no longer says 'Current deployment...' multiple times
  external bootstrap spec should not depend on clean state, stop using ec2.instances.first [#42828011]
  add rake task for external aws bootstrap spec
  retry on all aws errors during vpc delete
  make delete_all_security groups more robust
  update security_group_in_use? logic
  ignore aws_rds_receipt.yml files
  external specs for VPC subnet and route table creation
  WIP to add external tests for bosh aws bootstrap CLI [#42828011]
  config travis to ignore ruby 2.0 failures
  bosh release #13
  Handle version comparison better
  Make Aws and Openstack Registry 'delete settings' idempotent
  Changes to allow running Bosh on Ruby 2.0
  Remove comment from Rubygems2 cleanup
  Added support for retrieving from global compiled package cache
  make cli work with rubygems 2
  enable bat:disk 'should create a disk' example
  ...
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add AWS bootstrap external spec for ELB configuration
  increase Bosh CLI refresh rate to 10s to reduce deploy output for CI test
  Add external AWS bootstrap CLI tests for security groups and DHCP option sets
  Renamed global_blobstore to compiled_package_cache
  get director debug log if we have a failure
  Adding ruby-version file
Merge branch 'master' into warden-cpi

Conflicts:
	agent/lib/agent/message/disk.rb
	agent/lib/agent/platform/ubuntu/network.rb
	agent/stemcell2.rake
	director/Gemfile
	director/Gemfile.lock
	director/migrations.rake
Rename warden_cpi -> bosh_warden_cpi
Fix Gemfile for bosh_warden_cpi
Rename warden_cpi -> bosh_warden_cpi
Fix dependencies
Remove Gemfile from bosh_warden_cpi
spec_helper is in the load path
Remove Rakefile