From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 26 May 2017 18:21:01 +0000 (-0400)
Subject: Merge branch 'master' into 11100-cwl-set-output-ttl
X-Git-Tag: 1.1.0~225^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/4dac499d30988fd8289a40ad4128d6d471037180

Merge branch 'master' into 11100-cwl-set-output-ttl
---

4dac499d30988fd8289a40ad4128d6d471037180
diff --cc sdk/cwl/setup.py
index efed1cc72d,02c612fa90..df988f6991
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@@ -52,9 -52,8 +52,9 @@@ setup(name='arvados-cwl-runner'
            'schema-salad==2.5.20170428142041',
            'typing==3.5.3.0',
            'ruamel.yaml==0.13.7',
-           'arvados-python-client>=0.1.20170327195441',
+           'arvados-python-client>=0.1.20170526013812',
 -          'setuptools'
 +          'setuptools',
 +          'ciso8601'
        ],
        data_files=[
            ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),