Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorMarco Yuen <marcoy@gmail.com>
Wed, 9 Nov 2011 21:11:05 +0000 (16:11 -0500)
committerMarco Yuen <marcoy@gmail.com>
Wed, 9 Nov 2011 21:11:05 +0000 (16:11 -0500)
commitfd63ac8ec5675dd673b1433273c3dfb241704c24
tree64f10551f3b360611bfbd55268dcc73a44537951
parentca18349434328b58a7840a2605ab40df1fb72536
parent083e785d2b550d99770c07ed317ee0b6c13e4118
Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel