From: radhika <radhika@curoverse.com>
Date: Fri, 25 Sep 2015 12:32:46 +0000 (-0400)
Subject: Merge branch 'master' into 7161-support-all-service-types
X-Git-Tag: 1.1.0~1339^2^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/743022a885b563e47bc5d31e144b5165ab4688c9?hp=-c

Merge branch 'master' into 7161-support-all-service-types
---

743022a885b563e47bc5d31e144b5165ab4688c9