From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 21 Aug 2014 16:13:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036... 
X-Git-Tag: 1.1.0~2275^2~16
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6403b8728d3120d6cb22583b3963d2a030e88aa3?hp=6403b8728d3120d6cb22583b3963d2a030e88aa3

Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036' into 3036-collection-uuids

Conflicts:
	sdk/python/arvados/commands/put.py
	sdk/python/tests/test_arv_put.py
---