Commit Graph

2 Commits

Author SHA1 Message Date
Gabor Apati-Nagy
15f69ef584 CP-18014: Alter batch hotfixing to use host.patches_requiring_reboot
Improving AvoidRestartHost usage/interface

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-08-26 16:04:28 +01:00
Gabor Apati-Nagy
0174974c93 Merge branch 'master' of https://github.com/xenserver/xenadmin into CP-18014
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	XenAdmin/Wizards/PatchingWizard/PatchingWizard.cs
	XenAdmin/Wizards/PatchingWizard/PatchingWizard_PrecheckPage.cs
	XenModel/Messages.Designer.cs
	XenModel/Messages.ja.resx
	XenModel/Messages.resx
	XenModel/Messages.zh-CN.resx
2016-08-26 15:22:03 +01:00