From: Tom Clegg <tom@curoverse.com>
Date: Fri, 30 Jun 2017 18:30:34 +0000 (-0400)
Subject: Merge branch '11807-yaml-to-json'
X-Git-Tag: 1.1.0~161
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/55aafbb07904ca24390dd47ea960eae7cb2b909a

Merge branch '11807-yaml-to-json'

refs #11807

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

55aafbb07904ca24390dd47ea960eae7cb2b909a