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.
  ...
Always generate bat deployment manifest, even if not provisioning
set BAT_DNS_HOST
Turns out, you cant set the dns server to a hostname
debugging ci
Take Gemfile.lock into account when resolving gems to copy.
stemcell version
create disk is failing in ci
no more fast fail
cf-release works on master now
aws stub location
cleanup
Merge branch 'bat_in_ci'
Update Gemfile.lock to connect to rubygems via SSL