git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0857100 f36750e)
Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 11 Jul 2013 08:22:25 +0000 (10:22 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 11 Jul 2013 08:22:25 +0000 (10:22 +0200)
1  2 
plugins/omf_resctl.py patch | diff1 | diff2 | blob | history

diff --cc plugins/omf_resctl.py
Simple merge
nodemanager