Revision 2492f640
| ID | 2492f6400157806eef4553618bcb723899ab2ad4 |
Merge branch 'grnet-2.7-esi-devel' into master-ippool-hotplug-esi
Conflicts:
Makefile.am
lib/backend.py
lib/cmdlib.py
lib/constants.py
Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
Files
- added
- modified
- copied
- renamed
- deleted