Revision 268dca3a
ID | 268dca3a827b0815c12daa99e9c2f471acc566d3 |
Merge branch 'stable-2.6' into stable-2.6-ippool-hotplug-esi
Conflicts:
lib/cmdlib.py
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Files
- added
- modified
- copied
- renamed
- deleted