Merge "deprecated support of pipeline.yaml for polling"

This commit is contained in:
Jenkins 2017-03-28 22:50:22 +00:00 committed by Gerrit Code Review
commit 34e31abcf0
2 changed files with 8 additions and 2 deletions

View File

@ -872,8 +872,9 @@ class PollingManager(ConfigManagerBase):
try:
cfg = self.load_config(cfg_file)
except (TypeError, IOError):
LOG.warning(_LW('Unable to locate polling configuration, falling '
'back to pipeline configuration.'))
LOG.warning(_LW('Using the pipeline configuration for polling '
'is deprecated. %s should '
'be used instead.'), cfg_file)
cfg = self.load_config(conf.pipeline_cfg_file)
self.sources = []
if 'sources' not in cfg:

View File

@ -0,0 +1,5 @@
---
deprecations:
- |
Usage of pipeline.yaml for polling configuration is now deprecated. The
dedicated polling.yaml should be used instead.