Merge branch '12822-keepproxy-token-scope'
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Dec 2017 22:04:36 +0000 (17:04 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Dec 2017 22:04:36 +0000 (17:04 -0500)
commitdd8e2deab16cfdf261c45e139be38b756f8bb324
tree7169b5175b919aa9d5a6db82f7078cc6dce4b0da
parent0ed6f60c51ad94240cfd811e65cdb788a8f4e80e
parente112475459e4cab53cac0121606bc895efeb5ae5
Merge branch '12822-keepproxy-token-scope'

refs #12822

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>