Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 00b147a6649b8fd1112fa76c573fa78db8e58621 https://github.com/galaxyproject/galaxy/commit/00b147a6649b8fd1112fa76c573fa... Author: John Chilton jmchilton@gmail.com Date: 2016-11-14 (Mon, 14 Nov 2016)

Changed paths: M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/metrics/__init__.py M lib/galaxy/jobs/metrics/collectl/cli.py M lib/galaxy/jobs/metrics/collectl/subsystems.py M lib/galaxy/jobs/metrics/instrumenters/core.py M lib/galaxy/jobs/metrics/instrumenters/cpuinfo.py M lib/galaxy/jobs/metrics/instrumenters/env.py M lib/galaxy/jobs/metrics/instrumenters/meminfo.py M lib/galaxy/objectstore/rods.py M lib/galaxy/tools/cwl/runtime_actions.py M lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/mulled/_cli.py M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/output_collection_def.py M lib/galaxy/tools/toolbox/lineages/tool_shed.py M lib/galaxy/tools/toolbox/parser.py M lib/galaxy/util/__init__.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/object_wrapper.py

Log Message: ----------- Bring in updates from galaxy-lib.

Commit: 7e988bbe097f4f4e3d1f7c5dc3d149ee0c201bd8 https://github.com/galaxyproject/galaxy/commit/7e988bbe097f4f4e3d1f7c5dc3d14... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2016-11-14 (Mon, 14 Nov 2016)

Changed paths: M lib/galaxy/exceptions/error_codes.py M lib/galaxy/jobs/metrics/__init__.py M lib/galaxy/jobs/metrics/collectl/cli.py M lib/galaxy/jobs/metrics/collectl/subsystems.py M lib/galaxy/jobs/metrics/instrumenters/core.py M lib/galaxy/jobs/metrics/instrumenters/cpuinfo.py M lib/galaxy/jobs/metrics/instrumenters/env.py M lib/galaxy/jobs/metrics/instrumenters/meminfo.py M lib/galaxy/objectstore/rods.py M lib/galaxy/tools/cwl/runtime_actions.py M lib/galaxy/tools/cwl/schema.py M lib/galaxy/tools/deps/container_resolvers/mulled.py M lib/galaxy/tools/deps/containers.py M lib/galaxy/tools/deps/mulled/_cli.py M lib/galaxy/tools/deps/mulled/mulled_build.py M lib/galaxy/tools/deps/mulled/mulled_build_channel.py M lib/galaxy/tools/deps/resolvers/conda.py M lib/galaxy/tools/deps/resolvers/modules.py M lib/galaxy/tools/parser/output_actions.py M lib/galaxy/tools/parser/output_collection_def.py M lib/galaxy/tools/toolbox/lineages/tool_shed.py M lib/galaxy/tools/toolbox/parser.py M lib/galaxy/util/__init__.py M lib/galaxy/util/hash_util.py M lib/galaxy/util/object_wrapper.py

Log Message: ----------- Merge pull request #3169 from jmchilton/galaxy-lib-update-3

Bring in updates from galaxy-lib.

Compare: https://github.com/galaxyproject/galaxy/compare/66cc4c3bbe4a...7e988bbe097f