projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2e8b80
9acc769
)
14807: Merge branch 'master'
author
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Feb 2019 16:49:18 +0000
(11:49 -0500)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 20 Feb 2019 16:49:18 +0000
(11:49 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
1
2
lib/controller/federation_test.go
patch
|
diff1
|
diff2
|
blob
|
history
services/api/app/models/container.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/test/unit/container_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/controller/federation_test.go
Simple merge
diff --cc
services/api/app/models/container.rb
Simple merge
diff --cc
services/api/test/unit/container_test.rb
Simple merge