automatic promotion by GoCD workflow LoggregatorIntegrationTest/125 > IntegrationTests/1 > IntegrationTests

tests passed against https://github.com/cloudfoundry/cf-release/commit/3dd74ed8a4cd40da905fe7f32fed023063c521b0
Merge remote-tracking branch 'origin/lamb-develop' into lamb-acceptance
Merge remote-tracking branch 'origin/lamb-develop' into lamb-acceptance
Merge branch 'lamb-develop' into lamb-acceptance

Conflicts:
	src/loggregator
Merge branch 'lamb-acceptance' into lamb-develop

Conflicts:
	src/cloud_controller_ng