projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9eb040 e8670f2)
Merge remote-tracking branch 'refs/remotes/origin/3504-clients-compatible-with-3036...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Aug 2014 16:13:30 +0000 (12:13 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 21 Aug 2014 16:13:30 +0000 (12:13 -0400)
Conflicts:
sdk/python/arvados/commands/put.py
sdk/python/tests/test_arv_put.py

1  2 
sdk/python/arvados/commands/put.py patch | diff1 | diff2 | blob | history
sdk/python/tests/test_arv_put.py patch | diff1 | diff2 | blob | history

diff --cc sdk/python/arvados/commands/put.py
Simple merge
diff --cc sdk/python/tests/test_arv_put.py
Simple merge