From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Wed, 29 Nov 2017 16:14:44 +0000 (-0300)
Subject: Merge branch '12662-multisite-add-broken'
X-Git-Tag: 1.1.2~43
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/35035ce1c0e71990a30f6b1cc2aad961d06774cd

Merge branch '12662-multisite-add-broken'
Refs #12662

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---

35035ce1c0e71990a30f6b1cc2aad961d06774cd