13493: Merge branch 'master' into 13493-federation-proxy
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 16 Jul 2018 13:46:23 +0000 (09:46 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 16 Jul 2018 13:46:23 +0000 (09:46 -0400)
commita93ef946eb1e73ee190ea4ff19c4f9278235530c
tree5be0b7f76fceb8c54746804b911dcdf3e5ff0f55
parent5eda2f0ee6fcab67d3a74517a85946435931c67b
parentdb5107dca09b786374f06a35abb51ffc3f032abd
13493: Merge branch 'master' into 13493-federation-proxy

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/controller/handler.go
lib/controller/handler_test.go
sdk/go/arvados/config.go
sdk/python/tests/run_test_server.py