From: radhika <radhika@curoverse.com>
Date: Thu, 22 Oct 2015 17:14:00 +0000 (-0400)
Subject: refs #7167
X-Git-Tag: 1.1.0~1296
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/036656d9d65ee62771d0b47b5b3407aece833c8b

refs #7167
Merge branch '7167-keep-rsync'
---

036656d9d65ee62771d0b47b5b3407aece833c8b