Revision 162e70ed
| ID | 162e70ed80d1cf5c11c607260e9b20acc148df3e |
| Parent | 664249e9, 59a5de9e |
| Child | f2ee5004 |
Merge branch 'stable-2.6-hotplug' 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