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