Merge branch '1885-keep-proxy' into 2751-python-sdk-keep-proxy-support
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 18:16:42 +0000 (14:16 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 May 2014 18:16:42 +0000 (14:16 -0400)
commit27ffca811e6f43225fc82d582d1962eebbd1ab6e
tree00c4bde477445b7d607d1ee128eeedd7223cb1b0
parent77d3ed33f525bd6859580954c6d7b9b36b394b98
parentb646cec74484bf07a54f4be2de712f50dc387aa0
Merge branch '1885-keep-proxy' into 2751-python-sdk-keep-proxy-support
sdk/python/arvados/keep.py