Merge branch 'master' into 4823-python-sdk-writable-collection-api
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 16 Feb 2015 15:59:23 +0000 (10:59 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 16 Feb 2015 15:59:23 +0000 (10:59 -0500)
commitf22dda84271714c924c322bafba5e9f184e4fb33
tree131c7b0ab6b29359e2876ef1cb18d948230958d5
parentf8f654db2a5efc85a358dfd126be4ccb1abb322d
parent0cefa4c0f3c1b16884b04d6273bd8730166d69ba
Merge branch 'master' into 4823-python-sdk-writable-collection-api

Conflicts:
sdk/python/tests/arvados_testutil.py
services/fuse/arvados_fuse/__init__.py
sdk/python/tests/arvados_testutil.py
sdk/python/tests/test_collections.py
services/fuse/arvados_fuse/__init__.py