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