Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Aug 2014 16:13:30 +0000 (12:13 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Aug 2014 16:13:30 +0000 (12:13 -0400)
commit6403b8728d3120d6cb22583b3963d2a030e88aa3
treecd11786b5944f617bd21cf943158ce9abcbf9ff4
parentb9eb04049c7740e8021a9810ed3adccb338d556b
parente8670f2a3e44458c963bb4b08a57d812a9b9d902
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
sdk/python/arvados/commands/put.py
sdk/python/tests/test_arv_put.py