Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 9d736dd42eba2e8bd116d575c7d1278e15183ba3 https://github.com/galaxyproject/galaxy/commit/9d736dd42eba2e8bd116d575c7d12... Author: John Chilton <jmchilton@gmail.com> Date: 2017-03-22 (Wed, 22 Mar 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/__init__.py Log Message: ----------- Fix container resolution. Without these decorators swapped - resolving containers results in the following Exception: ``` TypeError: unbound method __str__() must be called with ContainerResolver instance as first argument (got nothing instead) ``` I think this recent merge commit 3ed60db5ce9bf2acb954c843c14f8983b11ffbd9 introduced this problem as it merged the two decorators together. Commit: 8a033b720b370a7e7e9049fa22a5c7a78f0d5a85 https://github.com/galaxyproject/galaxy/commit/8a033b720b370a7e7e9049fa22a5c... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2017-03-22 (Wed, 22 Mar 2017) Changed paths: M lib/galaxy/tools/deps/container_resolvers/__init__.py Log Message: ----------- Merge pull request #3805 from jmchilton/container_resolution_fix Fix container resolution. Compare: https://github.com/galaxyproject/galaxy/compare/f8950feb30ca...8a033b720b37