git://git.onelab.eu / nepi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f92e258 64d23d7)
Merge from multihop_ssh to nepi-3-dev
authorLucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
Thu, 30 Jan 2014 15:17:47 +0000 (16:17 +0100)
committerLucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
Thu, 30 Jan 2014 15:17:47 +0000 (16:17 +0100)
1  2 
src/nepi/execution/resource.py patch | diff1 | diff2 | blob | history
src/nepi/resources/planetlab/node.py patch | diff1 | diff2 | blob | history

diff --cc src/nepi/execution/resource.py
Simple merge
diff --cc src/nepi/resources/planetlab/node.py
Simple merge
nepi