projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61b286d
6264565
)
Merge branch 'master' into 10231-keep-cache-runtime-constraints
author
radhika <radhika@curoverse.com>
Mon, 31 Oct 2016 16:04:51 +0000
(12:04 -0400)
committer
radhika <radhika@curoverse.com>
Mon, 31 Oct 2016 16:04:51 +0000
(12:04 -0400)
1
2
sdk/cwl/arvados_cwl/arvcontainer.py
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/unit/container_request_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/crunch-run/crunchrun.go
patch
|
diff1
|
diff2
|
blob
|
history
services/crunch-run/crunchrun_test.go
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sdk/cwl/arvados_cwl/arvcontainer.py
Simple merge
diff --cc
services/api/test/unit/container_request_test.rb
Simple merge
diff --cc
services/crunch-run/crunchrun.go
Simple merge
diff --cc
services/crunch-run/crunchrun_test.go
Simple merge