Skip to content
Snippets Groups Projects
Commit 268dca3a authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis
Browse files

Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi


Conflicts:
	lib/cmdlib.py

Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parents 04da9087 88f622e0
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment