projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d4be0f 57bdcaa)
Merge branch '16263-logincluster-user-list-fix' refs #16263
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 13 Apr 2020 14:42:47 +0000 (10:42 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 13 Apr 2020 14:42:47 +0000 (10:42 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
lib/controller/federation/conn.go patch | diff1 | diff2 | blob | history
lib/controller/rpc/conn.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/api.go patch | diff1 | diff2 | blob | history

diff --cc lib/controller/federation/conn.go
Simple merge
diff --cc lib/controller/rpc/conn.go
Simple merge
diff --cc sdk/go/arvados/api.go
Simple merge