Merge branch 'master' into 2755-python-sdk-permissions
authorTim Pierce <twp@curoverse.com>
Fri, 30 May 2014 19:22:32 +0000 (15:22 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 30 May 2014 19:22:32 +0000 (15:22 -0400)
commitc1e7255a85dfc2807ba78e1cf9d109d896c80b42
tree177bb3eea0856b4568ce937c068169510c609647
parent39b2ed3024860262747fd6622433e0bf7ba39530
parentc7ee5e02cae78d3edff6ed393d776c4995441896
Merge branch 'master' into 2755-python-sdk-permissions

Conflicts:
sdk/python/bin/arv-put
sdk/python/arvados/collection.py
sdk/python/arvados/commands/put.py
sdk/python/tests/test_keep_client.py