9799: Merge branch 'master' into 9799-nonadmin-logs
authorTom Clegg <tom@curoverse.com>
Mon, 5 Sep 2016 17:47:54 +0000 (13:47 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 Sep 2016 17:47:54 +0000 (13:47 -0400)
commitdcb6eaa5012bf1eea607c61209bee18723769c24
tree728483fe88adba4ecf0df3428560178e6e5f220e
parentaf0ece600054c97aae9661ed06731af47873a7ff
parentd5ebfb1d35d2458742c545af4ee16c9f14de08bb
9799: Merge branch 'master' into 9799-nonadmin-logs

Conflicts:
apps/workbench/test/integration/application_layout_test.rb
apps/workbench/app/models/container_work_unit.rb
apps/workbench/test/integration/work_units_test.rb
services/api/app/models/arvados_model.rb