Merge branch 'master' into 10231-keep-cache-runtime-constraints
authorradhika <radhika@curoverse.com>
Mon, 31 Oct 2016 16:04:51 +0000 (12:04 -0400)
committerradhika <radhika@curoverse.com>
Mon, 31 Oct 2016 16:04:51 +0000 (12:04 -0400)
1  2 
sdk/cwl/arvados_cwl/arvcontainer.py
services/api/test/unit/container_request_test.rb
services/crunch-run/crunchrun.go
services/crunch-run/crunchrun_test.go

Simple merge
Simple merge
Simple merge