Update the UAA to 1.4.6.
Resolve merge conflicts
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Jeff Schnitzer and Zach Robinson:
     Deactivate plans that are absent from v2 service broker catalogs. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12836414 )
Revert "Resolve merge conflicts"

This reverts commit 9e509fe23715c6f1bab28b66d5386c70776a7f0e.
Update the UAA to 1.4.6 per pr/194.

Resolve conflicts in merge.
Add loggregator incoming_port property to jobs; add defaults

Signed-off-by: Matthew McNew <mmcnew@pivotallabs.com>
Bump src/cloud_controller_ng

Bump cloudfoundry/cloud_controller_ng:
  Jeff Schnitzer and alex choi:
     Retroactively set plan active column default to true. ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12851027 )
  Matthew Sykes and Phan Le:
     Change the -m to -s reflect actual task of adding seed data to cloud controller ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12850793 )
     Added test to ensure loggregator event emitted. ( Travis Unknown )
  Jimmy Da:
     Merge pull request #111 from cloudfoundry/fix_events_pagination ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12843481 )
  Chris Adams and Sean Brady:
     Merge remote-tracking branch 'origin/master' into fix_events_pagination ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12841223 )
     URL escape next_url ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12841129 )
Remove unused blob keys

These keys were originally removed in commit
696eb0ab50602c168a53bdc1ec72d4cb213ee2a8.
The blob keys were re-added by accident during a pull request merge.
Bump src/cloud_controller_ng, src/collector, src/hm9000

Bump cloudfoundry/cloud_controller_ng:
  Jeff Schnitzer and alex choi:
     Retroactively set plan active column default to true. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12851027 )
  Matthew Sykes and Phan Le:
     Change the -m to -s reflect actual task of adding seed data to cloud controller ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12850793 )
     Added test to ensure loggregator event emitted. ( Travis Unknown )
     Delete droplets in background ( Travis Unknown )
  Jimmy Da:
     Merge pull request #111 from cloudfoundry/fix_events_pagination ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12843481 )
  Chris Adams and Sean Brady:
     Merge remote-tracking branch 'origin/master' into fix_events_pagination ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12841223 )
     URL escape next_url ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12841129 )
  Jeff Schnitzer and Zach Robinson:
     Deactivate plans that are absent from v2 service broker catalogs. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12836414 )
  phanle:
     Remove buildpack cache and app package from blobstore in background ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12801715 )
     Upload buildpack cache in background ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12768819 )
  Mark Rushakoff:
     Restore logging around blobstore upload ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12777298 )
     The great copyright line purge of 2013 ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12742990 )
     Merge remote-tracking branch 'origin/log-staging' ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12738154 )
     Merge pull request #106 from julz/local_api_spec_css ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12737753 )
     Merge pull request #107 from cloudfoundry/loggregator_emitter_v1 ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12735743 )
     More logging around staging ( Travis Unknown )
     More logging in strange missing self case ( Travis Unknown )
     More logging in stagings controller ( Travis Unknown )
  Maria Shaldibina:
     Return valid JSON /v2/apps/:guid/bits ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12743143 )
  John Foley and Tim Labeeuw:
     Make the api docs not run in seperate threads ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12739578 )
     Fix the api docs build ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12736307 )
     Try 3 threads. See if this is the magic number ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12736039 )
     Try to see if travis is faster with 2 threads instead of 4 ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12733769 )
     Fix Postgres and the weird way parallel_rspec does the first build ( Travis Unknown )
     Added bundle exec ( Travis Unknown )
     First attempt at making Travis test parallel ( Travis Unknown )
     Added a reset database to the buildpacks spec ( Travis Unknown )
     Fix a test pollution in blobstore tests ( Travis Unknown )
  Casey McTaggart:
     Merge branch 'master' into loggregator_emitter_v1 ( Travis Unknown )
     Merge branch 'master' into loggregator_emitter_v1 ( Travis Unknown )
     Bump loggregator_emitter to version 1.0.0 ( Travis Unknown )
  Onsi Fakhouri and Sarah Chandler:
     rename first_crash_time => crash_count in hm9000_client ( Travis Unknown )
     hm9000_client is born ( Travis Unknown )
  Matthew Sykes, Phan Le and Ruth Byers:
     Minor refactor to remove duplicate logic of droplet key generation. ( Travis Unknown )
     Remove droplet files when a droplet is destroyed. ( Travis Unknown )
  Tim Labeeuw:
     Only run the docs if its the doc build ( Travis Unknown )
  Mark Rushakoff and Sara Tansey:
     Fix logger call in App ( Travis Unknown )
  Matthew Sykes and Tim Labeeuw:
     Admin buildpacks can be prioritized. ( Travis Unknown )
  cf-frameworks:
     Merge pull request #105 from cloudfoundry/loggregator_emitter_gem_update ( Travis Unknown )
  julz:
     Allow Bootstrap CSS to load when API specs are run from disk ( Travis Unknown )
  Matthew McNew:
     Updated the Loggregator Emitter gem ( Travis Unknown )
Bump cloudfoundry/collector:
  Alex Suraci and Onsi Fakhouri:
     removed vcap_sequel.  it was getting in the way. ( Travis started: https://travis-ci.org/cloudfoundry/collector/builds/12852302 )
  Mark Rushakoff:
     The great copyright line purge of 2013 ( Travis Success: https://travis-ci.org/cloudfoundry/collector/builds/12743095 )
Bump cloudfoundry/hm-workspace:
  Alex Suraci and Onsi Fakhouri:
     refactor data store layout ( Travis started: https://travis-ci.org/cloudfoundry/hm-workspace/builds/12852034 )
  Onsi Fakhouri and Sarah Chandler:
     add created_at to crash count ( Travis Success: https://travis-ci.org/cloudfoundry/hm-workspace/builds/12733253 )
     bump test framework ( Travis Success: https://travis-ci.org/cloudfoundry/hm-workspace/builds/12720099 )
Bump yetis for loggregator fix
Defer the start of the cloud controller job processor until after
the cloud controller migration completes.

Migration runs on the first (canary) instance of the cloud controller.
On the canary, we make the cloud_controller_ng_job depend on the CC.

[#59256976]
Bump src/cloud_controller_ng, src/hm9000

Bump cloudfoundry/cloud_controller_ng:
  Alex Suraci and Onsi Fakhouri:
     added timeout to app.state nats request ( Travis created: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12905674 )
     don't deserialize app.state responses twice ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12905227 )
     CC gets app.state over NATS ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12901915 )
  Ruth Byers and Tim Labeeuw:
     Last attempt at fixing the parallel specs. Promise ( Travis started: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12904745 )
     probably fixes cc tests ( Travis Unknown )
     Revert "Add transactional tests. Remove #reset_database. Add random order." ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12889114 )
     Fix a test pollution case when running in parallel ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12858699 )
     Add transactional tests. Remove #reset_database. Add random order. ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12858150 )
  Ruth Byers:
     Clean up after messy apps controller test ( Travis Unknown )
     Fixing mysql tests:  missed one ( Travis Unknown )
     Fix failing mysql tests ( Travis Unknown )
  pivotal:
     Revert "Revert "Add transactional tests. Remove #reset_database. Add random order."" ( Travis Unknown )
  Jeff Schnitzer and alex choi:
     Use http instead of https for rubygems.org ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12901172 )
     Revert "wip on adding syslog_drain_url" ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12857983 )
     Revert "syslog_drain_url is added to service_instances, credentials are now optional" ( Travis Unknown )
  Matthew Sykes and Phan Le:
     Resurrect pending tests after 14 months. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12890835 )
     Removed pending tests in app_spec. ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12890457 )
  Sarah Chandler:
     Don't stage when scaling an app ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12856382 )
  Maria Shaldibina:
     Merge pending specs and implement missing contexts ( Travis Unknown )
     Remove duplicate unimplemented (pending) specs ( Travis Unknown )
     Gather before() blocks and combine them ( Travis Unknown )
  Alex Suraci:
     syslog_drain_url is added to service_instances, credentials are now optional ( Travis Failed: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12856009 )
     re-word the request specs to fit the rest of them ( Travis Unknown )
  David Stevenson and alex choi:
     wip on adding syslog_drain_url ( Travis Unknown )
  Jimmy Da:
     Merge pull request #112 from cloudfoundry/revert_fix_events_pagination ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12853047 )
  Chris Adams and Sean Brady:
     Revert "Merge pull request #111 from cloudfoundry/fix_events_pagination" ( Travis Success: https://travis-ci.org/cloudfoundry/cloud_controller_ng/builds/12848735 )
Bump cloudfoundry/hm-workspace:
  Alex Suraci and Onsi Fakhouri:
     hm9000 now uses yagnats instead of gocfmessagebus ( Travis started: https://travis-ci.org/cloudfoundry/hm-workspace/builds/12901847 )
Add loggregator incoming_port property to jobs; add defaults

Signed-off-by: Matthew McNew <mmcnew@pivotallabs.com>
Merge pull request #201 from cloudfoundry/Loggregator_update_ports

Add loggregator incoming_port property to jobs; add defaults
Add loggregator shared_secret property

[#59337690, #59350160]

Signed-off-by: Stephan Hagemann <stephan@pivotallabs.com>
Bump dea and loggregator binaries

[#51986963, #56528048]

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>
More robust loggregator specs that lock down the version of the CLI

[#59354992]

Signed-off-by: Johannes Tuchscherer <jtuchscherer@pivotallabs.com>
Initial commit on wip_ha_proxy
Remove resource pools and extra blob
Merge pull request #197 from jfoley/wip_ha_proxy

Pulling in HAProxy to cf-release