Merge branch 'master' into 2751-python-sdk-keep-proxy-support refs #2751
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 20:47:45 +0000 (16:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 20:47:45 +0000 (16:47 -0400)
commitc0c0d769cd812e87efa392649380dc5ba8a25cd4
tree42cef527435db863424efbaef2fa38d9c3586322
parented101805b04c70bcbf1b070dceba2aee72170377
parent293b52241445edf9eb86e0a0f9b63fccc3aa7fbd
Merge branch 'master' into 2751-python-sdk-keep-proxy-support refs #2751
sdk/python/arvados/api.py
sdk/python/arvados/keep.py
sdk/python/test_keep_client.py
services/keep/src/arvados.org/keepproxy/keepproxy.go