Merge Monit and script logging.
Package Ruby buildpack as a zip
Remove Ruby src submodule
Ignore all .DS_Store files
remove online ruby buildpack from blobs
Added uaa_base to login properties, to be able to generate environment deployment with a different uaa
Merge pull request #401 from joek/uaa_base

Added login.uaa_base key to cf-properties.yml
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  James Myers:
     appease RuboCop: AssignmentInCondition ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26231371 )
     diego staging completion handler handles failure ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26176387 )
  Alex Stupakov and Leo Rossignac-Milon:
     Wrap a describe block around a test case that did not have one ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26176951 )
     Pollution Detection option added to specs ( Travis Unknown )
  Alex Stupakov, Leo Rossignac-Milon and Zach Robinson:
     Change 3 polluting tests to non-transactional ( Travis Unknown )
  David Sabeti and Hristo Iliev:
     Added service guid in service plans response for unauthenticated users ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26144125 )
  David Sabeti:
     Implement unauthenticated logic for /v2/service_plans and /v2/services ( Travis Unknown )
  Leo Rossignac-Milon and Zach Robinson:
     Bump api version. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/25897588 )
     appease rubocop ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/25896070 )

Signed-off-by: Amit Gupta <agupta@pivotallabs.com>
Merge branch 'develop' of https://github.com/cloudfoundry/cf-release into develop
Merge branch 'ruby_buildpack' of https://github.com/cf-buildpacks/cf-release into cf-buildpacks-ruby_buildpack

Conflicts:
	config/blobs.yml
Merge branch 'cf-buildpacks-ruby_buildpack' into develop
Revert "Merge pull request #401 from joek/uaa_base"

This reverts commit 17f63b55a3469930e8b1439b858a7efea70b6f8e, reversing
changes made to d0a80720b571bfe1a7ad9f22b6cd932b3c244c73.

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotallabs.com>
Merge branch 'master' into develop
Revert "Revert "Merge pull request #401 from joek/uaa_base""

We intended to merge the pull request to develop, not master

This reverts commit 3cc02e7e93e283d5dc47cad34f85013946bfc364.

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotallabs.com>
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Matthew Sykes:
     Merge branch sykesm-story71328862 ( Travis Unknown )
     Update API Docs checksum ( Travis Unknown )
     Correct api doc for positioning buidpacks ( Travis Unknown )

Signed-off-by: Joseph Palermo <jpalermo@pivotallabs.com>
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Matthew Sykes:
     Update API Docs checksum ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26238385 )
     Correct api doc for positioning buidpacks ( Travis Unknown )
  Michael Fraenkel:
     Run specs without parallel_test on travis ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/26235959 )

Signed-off-by: Joseph Palermo <jpalermo@pivotallabs.com>
Spec and template for dashboard client configurable scope

[#71594888]
Update to new rootfs blob.

- Removes tmp files from rootfs image.
Revert bump of src/gorouter

[#72208272]

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>
add python buildpack

Conflicts:
	config/blobs.yml