projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab7c978 5bb258b)
Merge branch 'master' into 3699-arv-copy
authorTim Pierce <twp@curoverse.com>
Fri, 19 Sep 2014 15:34:46 +0000 (11:34 -0400)
committerTim Pierce <twp@curoverse.com>
Fri, 19 Sep 2014 15:34:46 +0000 (11:34 -0400)
1  2 
sdk/python/setup.py patch | diff1 | diff2 | blob | history
sdk/python/tests/test_keep_client.py patch | diff1 | diff2 | blob | history

diff --cc sdk/python/setup.py
Simple merge
diff --cc sdk/python/tests/test_keep_client.py
Simple merge