Merge branch '2800-python-global-state' into 2800-pgs
authorTom Clegg <tom@curoverse.com>
Sat, 16 Aug 2014 06:06:20 +0000 (02:06 -0400)
committerTom Clegg <tom@curoverse.com>
Sat, 16 Aug 2014 06:06:20 +0000 (02:06 -0400)
commit0bd1c28bed9a0756c61037947d5a9dccd5066f00
tree0b812d595fa597172a370666f1a4f338a4934cc4
parentb5a278786165ebbbd63044cf9b5b64b949fe88ed
parentc6db15d0529212126920002665c9c99a4f864529
Merge branch '2800-python-global-state' into 2800-pgs

Conflicts:
sdk/python/arvados/api.py
sdk/python/arvados/api.py
sdk/python/tests/test_api.py