git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5320189 e4f2dc7)
Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 09:57:55 +0000 (11:57 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 20 Jun 2012 09:57:55 +0000 (11:57 +0200)
1  2 
setup.py patch | diff1 | diff2 | blob | history
slivermanager.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
diff --cc slivermanager.py
Simple merge
nodemanager