Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel
authorMarco Yuen <marcoy@cs.princeton.edu>
Mon, 7 May 2012 14:27:46 +0000 (10:27 -0400)
committerMarco Yuen <marcoy@cs.princeton.edu>
Mon, 7 May 2012 14:27:46 +0000 (10:27 -0400)
commit27cb8f7b65340c134d7d36f5eeef555592f73d31
treefc2dc46f6586c51f24a14f3a0bb8ca50999aacd8
parentec5f2d86752be85178da9c2b70421a9afae8ba01
parent2347282eeaee154cc23734d50072983767696d0b
Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/nodemanager into lxc_devel

Conflicts:
config_template.xml