projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2cba51 5a1b5b6)
Merge branch '16212-pam-login'
authorTom Clegg <tom@tomclegg.ca>
Wed, 8 Apr 2020 14:11:23 +0000 (10:11 -0400)
committerTom Clegg <tom@tomclegg.ca>
Wed, 8 Apr 2020 14:11:23 +0000 (10:11 -0400)
refs #16212

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
build/run-tests.sh patch | diff1 | diff2 | blob | history
lib/controller/handler.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/config.go patch | diff1 | diff2 | blob | history

diff --cc build/run-tests.sh
Simple merge
diff --cc lib/controller/handler.go
Simple merge
diff --cc sdk/go/arvados/config.go
Simple merge