projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d78838 fc8e572)
5037: Merge branch 'master' into 5037-nonocache
authorTom Clegg <tom@curoverse.com>
Tue, 10 Feb 2015 14:55:02 +0000 (09:55 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 10 Feb 2015 14:55:02 +0000 (09:55 -0500)
1  2 
services/fuse/setup.py patch | diff1 | diff2 | blob | history
services/nodemanager/setup.py patch | diff1 | diff2 | blob | history

diff --cc services/fuse/setup.py
Simple merge
diff --cc services/nodemanager/setup.py
Simple merge