projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b03914
8e603cb
)
Merge remote-tracking branch 'origin/master' into 2051-nondeterministic-jobs
author
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Mar 2014 19:38:51 +0000
(15:38 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Mar 2014 19:38:51 +0000
(15:38 -0400)
1
2
sdk/cli/bin/arv-run-pipeline-instance
patch
|
diff1
|
diff2
|
blob
|
history
services/api/app/controllers/arvados/v1/schema_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/script/crunch-dispatch.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
sdk/cli/bin/arv-run-pipeline-instance
Simple merge
diff --cc
services/api/app/controllers/arvados/v1/schema_controller.rb
Simple merge
diff --cc
services/api/script/crunch-dispatch.rb
Simple merge