git.onelab.eu Git - nodemanager.git/commit

author	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Fri, 15 Jun 2012 14:11:50 +0000 (17:11 +0300)
committer	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Fri, 15 Jun 2012 14:11:50 +0000 (17:11 +0300)
commit	55afbcaa2f8e9646bec3962e406f150f5d31b47b
tree	d4bfbdfab73bbe09d04a5d8f7c92570156ed32a3	tree \| snapshot
parent	27cb8f7b65340c134d7d36f5eeef555592f73d31	commit \| diff
parent	854fdfe526baa82adf31f14cac8a62223b310050	commit \| diff

Merge branch 'master' into lxc_devel

Conflicts:
NodeManager.spec
api.py
slivermanager.py

nodemanager