projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12be280 c36bac7)
Merge branch '17106-s3-fed-token'
authorTom Clegg <tom@tomclegg.ca>
Tue, 24 Nov 2020 16:55:48 +0000 (11:55 -0500)
committerTom Clegg <tom@tomclegg.ca>
Tue, 24 Nov 2020 16:55:48 +0000 (11:55 -0500)
fixes #17106

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

1  2 
doc/api/keep-s3.html.textile.liquid patch | diff1 | diff2 | blob | history
services/keep-web/s3.go patch | diff1 | diff2 | blob | history
services/keep-web/s3_test.go patch | diff1 | diff2 | blob | history

diff --cc doc/api/keep-s3.html.textile.liquid
Simple merge
diff --cc services/keep-web/s3.go
Simple merge
diff --cc services/keep-web/s3_test.go
Simple merge