Merge branch 'master' into 10293-cwl-cr-output
authorradhika <radhika@curoverse.com>
Thu, 17 Nov 2016 19:21:16 +0000 (14:21 -0500)
committerradhika <radhika@curoverse.com>
Thu, 17 Nov 2016 19:21:16 +0000 (14:21 -0500)
commit9f53e085c98249ba79d85ba59e6f1ca624fede10
tree02b985cef7ed9e76675d70fb5615bf9bc9c6f3c6
parentc40265a873d73f03a9ca077f18fe305d883fb4a5
parenta07c8bfac95524f3074d11cda0d6689b5e7bf9cc
Merge branch 'master' into 10293-cwl-cr-output

Conflicts:
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arvcontainer.py
doc/api/methods/container_requests.html.textile.liquid
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arvcontainer.py