Merge branch 'master' into 14874-protected-collection-properties
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 24 Jun 2019 13:22:52 +0000 (10:22 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 24 Jun 2019 13:22:52 +0000 (10:22 -0300)
commitf5764a05d616e8d3c55b94503d5a1f789ac66ea7
tree895db9093a3253d59475f7ae8d98652dc818a80c
parent067bb74eb31914bb9735e0b847bb91ba2f46fca5
parent2f4429e623199b9820d2296cf3788300caa7394b
Merge branch 'master' into 14874-protected-collection-properties

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
doc/_config.yml
doc/install/install-postgresql.html.textile.liquid
lib/config/config.default.yml
lib/config/generated_config.go
services/api/app/models/arvados_model.rb