Conflicts: cloud_controller/Gemfile cloud_controller/Gemfile.lock dea/Gemfile.lock dea/vendor/cache/vcap_common-1.0.3.gem health_manager/Gemfile health_manager/Gemfile.lock health_manager/vendor/cache/vcap_common-1.0.3.gem package_cache/vendor/cache/vcap_common-1.0.3.gem router/Gemfile.lock stager/Gemfile.lock staging/Gemfile.lock staging/vendor/cache/vcap_common-1.0.3.gem Change-Id: I58bb9fa584811e65e3f64189ab7110449d3ce139
In prod, the cloud controller rakefile is used when running migrations, i.e. bundle exec rake db:migrate, so we can't require ci_reporter from the rake file as that gem won't have been installed since it is only installed as part of the test group. Note that this is the only component that we need the rakefile for in prod, so it is the only one that needs such an update, which is good, because there isn't a standard way to tell if the DEA's, Rotuer's, etc. rakefiles are being invoked in in prod or test mode. Change-Id: I92af1cd18f0f5f03c4407cf7751265114bc770d3
…of rejecting it with an "Invalid uploaded file". This situation can arise as a result of the resource pool already containing all of the contents of an app."
…cting it with an "Invalid uploaded file". This situation can arise as a result of the resource pool already containing all of the contents of an app. Change-Id: I8205746c15a7405f9cc64b4be1d3e0c196b645ec
…e. For example, if database connection failed due to the failure on the database server, HM just logs:"