CRLF
CRLF
Merge branch 'master' of github.com:ankurcha/bosh

* 'master' of github.com:ankurcha/bosh: (30 commits)
  [aws_cpi] increase default retries since aws is so predictable
  Updating gemfile syntax for bundler 1.3
  [release] Add vip network to OpenStack sample
  [release] Add sample OpenStack deployment manifest using manual network
  [release] Indent style changes
  [openstack_cpi] Fix network section at usage doc
  [agent] Fix failing unit test for OpenStack infrastructure
  [agent] Set default OpenStack network type to manual
  [deployer] Add Errno::ETIMEDOUT when waiting for director
  [deployer] Cleanup default openstack properties
  [deployer] Fix blobstore provider [fixes #79]
  [openstack_cpi] Add endpoint_type to sample config file
  [openstack_cpi] Delete kernel_id and ramdisk_id options
  [release] Delete unused OpenStack stemcell options
  Delete bosh_aws_registry as it has been replaced by bosh_registry
  Delete bosh_openstack_registry as it has been replaced by bosh_registry
  [openstack_cpi] Add support for manual networks
  [release] Add OpenStack endpoint type to director job
  Upgrade fog gem to v1.10.0
  New style blobstore properties in deployer defaults [fix #79]
  ...