git://git.onelab.eu / nepi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee6a332 342187d)
Merge commit '342187d6e7ce34d4fdf403952637659b93aa4bee' into py3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 15 Oct 2015 16:29:11 +0000 (18:29 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 15 Oct 2015 16:29:11 +0000 (18:29 +0200)
* commit '342187d6e7ce34d4fdf403952637659b93aa4bee':
  resurrecting a minimal test infra - starting with linux node and application

1  2 
Makefile patch | diff1 | diff2 | blob | history
test/resources/linux/application.py patch | diff1 | diff2 | blob | history
test/resources/linux/node.py patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc test/resources/linux/application.py
Simple merge
diff --cc test/resources/linux/node.py
Simple merge
nepi