Disable nginx in monitc when ccng.use_nginx is false
Add ruby dependency to syslog aggregator job

[fixes #48421089]
Better subject for logs email

[#48421089]
update template to take erb properties for dea type and count
going back using 'production?' in the template
Bump src/cloud_controller_ng:

Alex Suraci and Gregg Van Hove (1):
      don't update expected state based on hm requests
a1: six instances oughtta be enough for anyone

[finishes #49807789]
Bump src/tests:

Alex Suraci and Gregg Van Hove (1):
      pend out node image magick yeti, since it's not working currently

Scott Calvert (1):
      Bump assets to include safer sinatra/app_sinatra_service
Remove marketplace_gateway

Bump src/services:

David Stevenson and Jesse Zhang (2):
      bump vcap-services-base
      Integration test for mysql shared varz passing

David Stevenson and Matt Royal (4):
      Marketplace provision integration test is passing
      CatalogManager can update pre-advertised services
      Remove proprietary marketplace gateway
      Fix unable to download instance handles due to dashboard_url

David Stevenson and Phan Le (6):
      Creating a bunch of tokens,     log ccng and mpgw to tmp folder.
      Extra info from MPGW specs
      Wait for process to be killed
      Trying to fix the build
      Kill dangling fake app direct process before starting a new one
      Bump vcap_services_base, int test for RDS extra and unique_id

David Stevenson and Scott Calvert (3):
      No longer need to patch yajl to version 1.1.0 for collector on OSX
      Reset collector and ccng to origin/master before startup
      Mysql RDS gateway can publish extra info attached to offering

David Stevenson, Matt Royal and Phan Le (1):
      Integration test for unprovision appdirect service

Georg Apitz and Jesse Zhang (1):
      Node advertises max capacity

Georg Apitz and Matt Royal (2):
      Allow import of unique_id for ServicePlans
      Revert "Allow import of unique_id for ServicePlans"

Georg Apitz and Ryan Tang (5):
      Monitor the remaining DB count [#47406705]
      Report number of provisioned databases in varz [#47406705]
      MySQL Gateway VARZ to advertise available, max, and used capacity [#47406705]
      Revert "MySQL Gateway VARZ to advertise available, max, and used capacity [#47406705]"
      More output on varz test

Jesse Zhang and Matt Royal (1):
      Cleanup to support extracted marketplace gateway

Jesse Zhang and Phan Le (2):
      Still trying to fix the build, could not produce locally
      Remove marketplace gateway from travis

Matt Royal (5):
      Properly provision services with dashes in label
      Reduce verbosity of CCNG logs in integration tests
      Correct bad assumption in marketplace integration
      Add bump-gem-version script to bump vcap_services_base and vcap_common
      Bump vcap_services_base gem

Matt Royal and Ryan Tang (3):
      Make spec the default rake task for spec directory
      Extract the logic to run Nats into NatsRunner
      Remove comment

Matt Royal and Scott Calvert (4):
      Bump the version of vcap_services_base
      Advertise unique_id for plans and services to CCNG
      Resolve tilt gem version conflict in integration specs
      Oops, include vendored gem update

Phan Le (1):
      Bumped vcap_common and pass the dashboard_url back to CCNG in the provision request response

Phan Le and Ryan Tang (4):
      RDS uses a different query for killing transactions.
      Use the CORRECT sql statement to kill tx on RDS.
      Passed the mysql_provider config to the node from the config file.
      Tell AppDirect the correct email to send notifications when providing.
                                                                                                                                                                                                                                                ()""""
update template to take elb from prod-aws/cf-aws-stub.yml
re-bump erroneously unbumped bumps
Put minimum UAA password strength to 1

[Finishes #49457739]
Bump src/cloud_controller_ng:

Alex Suraci and Tim Labeeuw (1):
      fix app events being registered multiple times

Tony Hansmann & Mark Rushakoff (3):
      Fix Ruby syntax warnings
      Refactor dea_pool
      Prefer to put app on DEA that has least instances of that app

Bump src/dea_next:

Tony Hansmann & Mark Rushakoff (1):
      DEA advertises how many instances it has of each app
Revert "Bump src/cloud_controller_ng:"

This reverts commit 782904c83293c19827f43949f5745f62f0feca6e.
Bump src/cloud_controller_ng:

Alex Suraci and Tim Labeeuw (1):
      fix app events being registered multiple times

Austin Vance and Max Brunsfeld (1):
      Merge branch 'OracleSupportSingleCommit' of github.com:youngm/cloud_controller_ng into youngm-OracleSupportSingleCommit

James Bayer and Tim Labeeuw (5):
      Added Oracle to Travis
      Make travis build this branch temp
      Adding a conditional for Oracle Gem
      Fixed the sqlite build. Attempted to fix the Oracle
      Updated to having all 3 Instant Client Libraries

Jesse Zhang and Tim Labeeuw (4):
      Made the unzipping correct for oracle
      Added AIO to the oracle build script
      Added the new Oracle DB credentials
      Merge remote-tracking branch 'origin/master' into youngm-OracleSupportSingleCommit

Jon Stevens and Kowshik Prakasam (6):
      Use secure URL for extra large oracle DB on CI
      Run random 25% tests for Oracle db
      Use right secure URL
      Merge branch 'youngm-OracleSupportSingleCommit'
      Wait for ccdb migrations to complete before starting integration specs
      Change secure URL for Oracle DB to point to medium instance on Amazon

Mike Youngstrom (9):
      Oracle support in Cloud Controller
      Improve Oracle monkey patch and comment out the ruby-oci8 dependency for     now so that travis will run against the currently supported databases.
      Merge remote-tracking branch 'github/master' into     OracleSupportSingleCommit and rename indexes
      Merge remote-tracking branch 'github/master' into OracleSupportSingleCommit
      Fixing travis.  I added a runtime requirement on     case_insensitive_monkey_patch.
      Explaining changes to text filed migration file
      Merge remote-tracking branch 'github/master' into     OracleSupportSingleCommit
      Merge remote-tracking branch 'github/master' into     OracleSupportSingleCommit
      Fix count query in test.

Tony Hansmann & Mark Rushakoff (3):
      Fix Ruby syntax warnings
      Refactor dea_pool
      Prefer to put app on DEA that has least instances of that app

Bump src/dea_next:

Tony Hansmann & Mark Rushakoff (1):
      DEA advertises how many instances it has of each app
Bump src/cloud_controller_ng:

David Sabeti and Gregg Van Hove (1):
      [#50024577] rescue from failed refresh, since the app seems to be going away sometimes in the yetis. Still looking at why that is
Bump src/cloud_controller_ng:

David Sabeti and Gregg Van Hove (2):
      Revert "Merge branch 'youngm-OracleSupportSingleCommit'"
      log a message for debugging why app is going away

Jon Stevens and Kowshik Prakasam (1):
      Run travis tests only for master branch
Bump src/cloud_controller_ng:

David Sabeti and Gregg Van Hove (3):
      [#50024577] rescue from failed refresh, since the app seems to be going away sometimes in the yetis. Still looking at why that is
      Revert "Merge branch 'youngm-OracleSupportSingleCommit'"
      log a message for debugging why app is going away

Gregg Van Hove and Tony Hansmann (1):
      add migrations from oracle patch that ran successfully

Jon Stevens and Kowshik Prakasam (1):
      Run travis tests only for master branch
Bump src/cloud_controller_ng:

Gregg Van Hove and Tony Hansmann (1):
      Revert "add migrations from oracle patch that ran successfully"
Bump src/cloud_controller_ng:

Alex Suraci and Mark Rushakoff (2):
      remove old config/code for running as an app on v1
      fix double app event registration via nats queues

Alex Suraci and Tim Labeeuw (1):
      Added the db column for kill after multiple restarts

Gregg Van Hove (2):
      more error logging when failing to stage apps
      don't run oracle tests