11065: Merge branch 'master' into 11065-optional-audit-logging
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 6 Sep 2018 14:29:25 +0000 (10:29 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 6 Sep 2018 14:29:25 +0000 (10:29 -0400)
commit1416b0952adc0bfee85e15d9c86a51c32fcfd003
tree9bfbfc0f36e1e9d12bedf8c9de3be1a2d2ebf4d1
parent19f787c5b5833623eee4d6cb88ddb909a5add7fc
parent490f5378e5e902fcf9735fc5520a515c989f350a
11065: Merge branch 'master' into 11065-optional-audit-logging

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/api/app/models/arvados_model.rb