Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 7a3cc410549474de18ff195c0e1dcd76fa92f64b https://github.com/galaxyproject/galaxy/commit/7a3cc410549474de18ff195c0e1dc... Author: John Chilton jmchilton@gmail.com Date: 2016-01-08 (Fri, 08 Jan 2016)

Changed paths: M lib/galaxy/tools/toolbox/watcher.py

Log Message: ----------- Fix optional watchdog handling.

Broken with 4086dd61dafe562ec01a8b1fce687a539aedbcfe.

Thanks for bug report from @nsoranzo.

Commit: e611b8fdb80beb87196a685924abe8e71bedcbea https://github.com/galaxyproject/galaxy/commit/e611b8fdb80beb87196a685924abe... Author: John Chilton jmchilton@gmail.com Date: 2016-01-08 (Fri, 08 Jan 2016)

Changed paths: M lib/galaxy/tools/toolbox/watcher.py

Log Message: ----------- Use a more typical optional default value for optional import in watcher.py.

Thanks to @nsoranzo for the advice - https://github.com/galaxyproject/galaxy/pull/1448#discussion_r49210125.

Commit: 88a1e636b8dea04a0db7d557fa6eb1483097b69d https://github.com/galaxyproject/galaxy/commit/88a1e636b8dea04a0db7d557fa6eb... Author: Daniel Blankenberg dan.blankenberg@gmail.com Date: 2016-01-08 (Fri, 08 Jan 2016)

Changed paths: M lib/galaxy/tools/toolbox/watcher.py

Log Message: ----------- Merge pull request #1448 from jmchilton/watcher_fix

[16.01] Fix optional watchdog handling.

Compare: https://github.com/galaxyproject/galaxy/compare/5d32c9f8fc7e...88a1e636b8de