add comment to main rakefile
Add travis-ci.org descriptor file
Merge branch 'master' of github.com:ankurcha/bosh

* 'master' of github.com:ankurcha/bosh:
  Add travis-ci.org descriptor file
Merge remote-tracking branch 'upstream/master'

* upstream/master: (58 commits)
  Remove Rakefiles... long live the single rake file
  Set resource pool size to 3 in simple test deployment
  Don't swallow error code
  Added route53 support to aws_bootstrap plugin
  aws bootstrap plugin provides CLI for emptying and deleting all S3 buckets
  Ignore sub directory Gemfiles / Gemfile.locks
  x failing test in travis so we can get green
  Ignore per-directory vendor cache
  Remove per-directory vendor cache
  Don't auto compile ruby
  Moved pending for travis to a higher level context
  Use 1.9.3 in travis
  Pending failing unit spec for CI
  Add default .rvmrc
  Don't require ruby gems and bundler in the bin script
  Remove cruft from tests
  Use --local for bundler in CI
  Turn on travis builds and turn off gerrit
  get integration tests to pass
  Gemfile and gemspec cleanup \n  - Move all components to be gems \n - Single Global Gemfile \n - Single Global vendor cache
  ...

Conflicts:
	.travis.yml
	Rakefile
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  AWS bootstrap plugin can terminate EC2 instances
  Create S3 bucket for every test run
  Ensure all bosh gems are in the Gemfile.
  Update blobstore_client in Gemfile.lock
  Fix up functional tests for S3
  Removed creation of Route53 hosted zone
  Cleanup require file All requires should be in top level gemname.rb file
  Don't swallow exit codes in at_exit blocks
  DNS domain name is configurable
  Fix spec for job manifest path in error messages.
  Add manifest path to job manifest errors.
  Bump version (dependencies changes since last bump)
  Rename agent to bosh_agent (both at top level dir and dir / files under lib
  Fix Error Code for CI
  adding bosh_common & bosh_cpi to Gemfile as path
  Fix typo
  Remove unnecessary rubygems and bundler requires
  Restore stemcell public rake tasks
  correctly handle exit codes for CI
Merge remote-tracking branch 'upstream/master'

* upstream/master: (36 commits)
  Add command to snapshot director deployments in aws bootstrap
  improve error message when initializing aws cloud cpi with missing parameters
  added required aws param to test file
  picked a cherry instead of descending into merge hell
  this is the actual merge
  fixing borken tests
  vpcsupport in aws cpi
  vpc support in aws cpi
  vpc support (static network type) in agent for aws
  Fix bug to allow stemcell deletions on AWS
  add director migrate script and remove director rakefile - added migrate:new to top level rakefile
  re-add sqlite deployer dependency
  fix stemcell restaging by adding src files to asset path
  fixup bosh release packages and ctl scripts to work with new gems
  Add missing nats gem, add libyaml to base stemcell
  agent fixes
  fixes to bosh_deployer
  stemcell bash scripts want fully qualified path to manifest and .tgz files
  Added missing vendor gem and fixedup file permissions
  Simplified rake stemcell:micro you only need to pass in the infrastructure now it will build the gems and stage them in the relese directory then it will create the release and pass the info to the steamcell creation task
  ...