Merge branch 'master' into 13817-runtime-app-configuration
authorMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 17 Jul 2018 10:10:02 +0000 (12:10 +0200)
committerMichal Klobukowski <michal.klobukowski@contractors.roche.com>
Tue, 17 Jul 2018 10:10:02 +0000 (12:10 +0200)
commit699f7cebc3057ddf22ca3c43c3d3534d605972ec
treeff5a2c16eb2ecf8435ff3e0c6a8f283447b138b5
parent22152102405a1407355d42a32385efd0d83bbc9c
parent017dcf25de396de8e382c9a288c62e21717aa600
Merge branch 'master' into 13817-runtime-app-configuration

refs #13817

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>