11308: Merge branch 'master' into 11308-python3
authorTom Clegg <tom@curoverse.com>
Wed, 12 Apr 2017 19:01:07 +0000 (15:01 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 12 Apr 2017 19:01:07 +0000 (15:01 -0400)
commit0b8673b62cd9717fcf7e3bbb608ae07018093d6f
tree150f0740f17afa76b1c180d5cddf9df413cea7db
parent06e1c2317d969fb5872cf1f2c29adaac7e0ef251
parent1b290e512496287e389424f3950f660f83c1c59b
11308: Merge branch 'master' into 11308-python3

Conflicts:
sdk/python/arvados/__init__.py
sdk/python/arvados/api.py
sdk/python/arvados/commands/ls.py
sdk/python/arvados/keep.py
sdk/python/setup.py
sdk/python/tests/test_arv_ls.py
build/run-tests.sh
sdk/python/arvados/api.py
sdk/python/arvados/commands/ls.py
sdk/python/arvados/keep.py
sdk/python/setup.py
sdk/python/tests/test_arv_ls.py