Merge branch 'master' into 12033-multisite-search
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 17 Aug 2017 17:18:41 +0000 (13:18 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 17 Aug 2017 17:18:41 +0000 (13:18 -0400)
commite38ac44d14e9006c24c93bca9de1ee299b16d367
tree010b6e54147fcf7cdcc6c805671d5dc23d3de6ee
parent67616c4716fb325cbd5d2eb5ed042d3a20569914
parent0b4800608e6394d66deec9cecea610c5fbbd75ad
Merge branch 'master' into 12033-multisite-search

refs #12033

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
apps/workbench/app/controllers/collections_controller.rb
build/run-build-packages.sh
build/run-tests.sh