Merge master to output-tags branch and resolve conflict
authorJiayong Li <jiayong@math.mit.edu>
Tue, 15 Nov 2016 19:59:55 +0000 (14:59 -0500)
committerJiayong Li <jiayong@math.mit.edu>
Tue, 15 Nov 2016 19:59:55 +0000 (14:59 -0500)
commitc14246b9a21d038fc6fa850f4032659a98397784
tree1497ef7b67a9070dd5fb2c9a7bc7119fcdedaf90
parent90c48f84391d6b4d6b8ed366d5a42d24bf6c696f
parent02010431f52911a6ff908e673c534291beb929ac
Merge master to output-tags branch and resolve conflict
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arvcontainer.py
sdk/cwl/arvados_cwl/arvjob.py
sdk/cwl/arvados_cwl/runner.py
sdk/cwl/tests/test_make_output.py