Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 93494a833ee390811bdc1d13c1ef54b52ed005f2 https://github.com/galaxyproject/galaxy/commit/93494a833ee390811bdc1d13c1ef5... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/config.py Log Message: ----------- This silences logging when display whitelist isn't explicitly defined and the default file doesn't exist. Explicit usage still logs a failure. Commit: 16280c63236621082ce4c3b3d93eb679294cd515 https://github.com/galaxyproject/galaxy/commit/16280c63236621082ce4c3b3d93eb... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py Log Message: ----------- Only attempt to read/load sanitize_whitelist_file when starting an actual galaxy application. Commit: 7534182d7afd8c997df7d919d0633345ee5c4dfa https://github.com/galaxyproject/galaxy/commit/7534182d7afd8c997df7d919d0633... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py Log Message: ----------- Add a default logger prior to full logging configuration. We currently attempt to log at various places in config parsing/etc that fail with 'No handlers could be found for logger ...', and this resolves that. Commit: cf91ab4511897ef5ac4beb8d56219119073073c4 https://github.com/galaxyproject/galaxy/commit/cf91ab4511897ef5ac4beb8d56219... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py M lib/galaxy/config.py Log Message: ----------- Merge pull request #1828 from dannon/cherrypick_logging [16.01] Fix startup logging Commit: 18128fa97d076bd42959435a004a0ee70ea63a04 https://github.com/galaxyproject/galaxy/commit/18128fa97d076bd42959435a004a0... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M lib/galaxy/app.py Log Message: ----------- Manually merge to resolve conflict, 16.01->dev Compare: https://github.com/galaxyproject/galaxy/compare/6b800a291dcf...18128fa97d07