Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel
authorXavi Leon <xleon@ac.upc.edu>
Thu, 10 Nov 2011 15:42:10 +0000 (10:42 -0500)
committerXavi Leon <xleon@ac.upc.edu>
Thu, 10 Nov 2011 15:42:10 +0000 (10:42 -0500)
commit2fbc810bde9fa8b3acb277f4d6157341073c7b6a
tree98cc584c903683ba493de12ee9c345f8aafc1ac6
parentf3350f3e23c22ca543754f371c02b43dfe08ceb0
parentb5f4c526ed94508bc4507f4ed04c87c0a1afa76e
Merge branch 'lxc_devel' of github.com:planetlab/NodeManager into lxc_devel

Conflicts:
sliver_libvirt.py
sliver_libvirt.py