11308: Merge branch 'master' into 11308-python3
authorTom Clegg <tom@curoverse.com>
Fri, 21 Apr 2017 20:02:50 +0000 (16:02 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 21 Apr 2017 20:02:50 +0000 (16:02 -0400)
commit31d31c010bb6b5170e3962fdd50c6d393cfe6076
treea38a82eb4bd0b7f7270fd2aaec5b6c25b7e8677d
parenta501e1d874f01acc318e7963837fbeb58a29f744
parentb04638275cff9b393e1bc04136d44f361b999cf8
11308: Merge branch 'master' into 11308-python3

Conflicts:
sdk/python/arvados/arvfile.py
sdk/python/arvados/commands/get.py
sdk/python/arvados/commands/migrate19.py
sdk/python/tests/test_arv_get.py
sdk/python/tests/test_arvfile.py
build/run-tests.sh
sdk/python/arvados/_ranges.py
sdk/python/arvados/arvfile.py
sdk/python/arvados/commands/get.py
sdk/python/arvados/commands/migrate19.py
sdk/python/arvados/commands/put.py
sdk/python/tests/test_arv_get.py
sdk/python/tests/test_arvfile.py
sdk/python/tests/test_stream.py