git://git.onelab.eu / nodemanager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 55afbca)
Merge branch 'master' into lxc_devel
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 15 Jun 2012 14:11:50 +0000 (17:11 +0300)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 15 Jun 2012 14:11:50 +0000 (17:11 +0300)
Conflicts:
NodeManager.spec
api.py
slivermanager.py


No differences found
nodemanager