Revision 55cb7c7a
| ID | 55cb7c7a72bb91a4cd9190575edcdf26e379d645 |
Merge remote branch 'google/stable-2.6' into stable-2.6-ippool-nichotplug-extstorage
Conflicts:
htools/Ganeti/HTools/QC.hs (import changes)
Signed-off-by: Constantinos Venetsanopoulos <cven@grnet.gr>
Files
- added
- modified
- copied
- renamed
- deleted