Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 4b7e86fa4323426e954270f2eb6d83b13d6c2752 https://github.com/galaxyproject/galaxy/commit/4b7e86fa4323426e954270f2eb6d8... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-01 (Fri, 01 Apr 2016) Changed paths: M lib/galaxy/tools/toolbox/parser.py Log Message: ----------- Clean up docstrings in lib/galaxy/tools/toolbox/parser.py. Commit: cb5e786aa906e0bfedb3a4bd85716e46c77a4e13 https://github.com/galaxyproject/galaxy/commit/cb5e786aa906e0bfedb3a4bd85716... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-01 (Fri, 01 Apr 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/parser.py M test/functional/tools/samples_tool_conf.xml M test/functional/tools/upload_tool_conf.xml Log Message: ----------- Allow tool confs with a tool_path to not be interpreted as shed confs. Commit: 34e3b7f1c2e3797dcb7afac49125b9f33accad8c https://github.com/galaxyproject/galaxy/commit/34e3b7f1c2e3797dcb7afac49125b... Author: John Chilton <jmchilton@gmail.com> Date: 2016-04-01 (Fri, 01 Apr 2016) Changed paths: M lib/galaxy/tools/toolbox/parser.py M test/functional/tools/samples_tool_conf.xml M test/functional/tools/upload_tool_conf.xml Log Message: ----------- Rename shed_conf attribute to is_shed_conf. Per discussion with @nsoranzo. Commit: 26569c3ec4b64a31f4827168cb042572ede28de0 https://github.com/galaxyproject/galaxy/commit/26569c3ec4b64a31f4827168cb042... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-04-01 (Fri, 01 Apr 2016) Changed paths: M lib/galaxy/tools/toolbox/base.py M lib/galaxy/tools/toolbox/parser.py M test/functional/tools/samples_tool_conf.xml M test/functional/tools/upload_tool_conf.xml Log Message: ----------- Merge pull request #2066 from jmchilton/static_tool_conf Allow tool confs with a tool_path to not be interpreted as shed confs. Compare: https://github.com/galaxyproject/galaxy/compare/18596a2bb47d...26569c3ec4b6