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

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


Conflicts:
	lib/cmdlib.py
	tools/cfgupgrade

Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
parents c9fc98df 2435f63b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment