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