git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ec5f2d8
2347282
)
Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel
author
Marco Yuen
<marcoy@cs.princeton.edu>
Mon, 7 May 2012 14:27:46 +0000
(10:27 -0400)
committer
Marco Yuen
<marcoy@cs.princeton.edu>
Mon, 7 May 2012 14:27:46 +0000
(10:27 -0400)
Conflicts:
config_template.xml
Trivial merge
git://git.onelab.eu / nodemanager.git / commitdiff