12216: Merge branch 'master' into 12216-webdav-list
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Oct 2017 17:55:54 +0000 (13:55 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 20 Oct 2017 17:55:54 +0000 (13:55 -0400)
commit6e8c3cc1fe4328b708d5979e27632835f74261fb
tree810494116286dcaf4da21bc69d5e4f78f143fbf1
parentad0566781a4345f6b9574adaf65cf70da2e4858e
parentb25f2bdceae4750c8c803853874227dc2d175767
12216: Merge branch 'master' into 12216-webdav-list

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>