[ARVADOS] updated: d27d9df7bfb7be820b4674675a240901348cfadb

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 50 +++++++++++++++++++++----
 sdk/cwl/tests/test_job.py       | 83 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 124 insertions(+), 9 deletions(-)

       via  d27d9df7bfb7be820b4674675a240901348cfadb (commit)
       via  a3d43ada117ee7e0535579fc3f1b66503f95b4c7 (commit)
       via  8b133b596ef25d548e01820c25595803bb49d18e (commit)
       via  ed646f12b58e930fe018dc4caf2121294c26e375 (commit)
      from  4447bfa5edac893079894484244318a872a0d3ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d27d9df7bfb7be820b4674675a240901348cfadb
Merge: 4447bfa a3d43ad
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 23 14:00:32 2016 -0400

    Merge branch '8766-cwl-collection-project'


commit a3d43ada117ee7e0535579fc3f1b66503f95b4c7
Merge: 8b133b5 4447bfa
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Mar 23 14:00:21 2016 -0400

    Merge branch 'master' into 8766-cwl-collection-project
    
    Conflicts:
    	sdk/cwl/tests/test_job.py

diff --cc sdk/cwl/tests/test_job.py
index ae48238,5731d08..4351b1a
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@@ -67,7 -67,7 +67,11 @@@ class TestJob(unittest.TestCase)
                      'task.env': {'TMPDIR': '$(task.tmpdir)'},
                      'command': ['ls']
                  }],
++<<<<<<< HEAD
 +                'crunchrunner': arvados_cwl.crunchrunner_pdh + '/crunchrunner'
++=======
+                 'crunchrunner': 'ff6fc71e593081ef9733afacaeee15ea+140/crunchrunner'
++>>>>>>> master
              },
              'script_version': 'master',
              'minimum_script_version': '9e5b98e8f5f4727856b53447191f9c06e3da2ba6',

-----------------------------------------------------------------------


hooks/post-receive
--