projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b8dfb5
1d36bef
)
Merge branch '13973-child-priority' refs #13973
author
Peter Amstutz <pamstutz@veritasgenetics.com>
Fri, 24 Aug 2018 19:33:56 +0000
(15:33 -0400)
committer
Peter Amstutz <pamstutz@veritasgenetics.com>
Fri, 24 Aug 2018 19:33:56 +0000
(15:33 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
1
2
services/api/app/models/container_request.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/unit/container_request_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/models/container_request.rb
Simple merge
diff --cc
services/api/test/unit/container_request_test.rb
Simple merge
projects / arvados.git / commitdiff