Konstantina Chremmou 67d1ddd1d1 Merge remote-tracking branch 'upstream/master' into feature/hyperman ... Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com> # Conflicts: # Branding/Branding.resx # Jenkinsfile # XenAdmin/Alerts/Types/GuiOldAlert.cs # XenAdmin/Alerts/Types/LicenseAlert.cs # XenAdmin/Commands/RestartToolstackCommand.cs # XenAdmin/Diagnostics/Problems/HostProblem/HostNotSafeToUpgradeWarning.cs # XenAdmin/Dialogs/AllowUpdatesDialog.cs # XenAdmin/Dialogs/OptionsPages/ConfirmationOptionsPage.cs # XenAdmin/Dialogs/RepairSRDialog.cs # XenAdmin/Dialogs/UpsellDialog.cs # XenAdmin/Plugins/UI/TabPageCredentialsDialog.cs # XenAdmin/Program.cs # XenAdmin/Wizards/ConversionWizard/ConversionNetworkPage.cs # XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs # XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs # XenAdmin/Wizards/PatchingWizard/PatchingWizard_FirstPage.cs # XenCenterLib/XSVersionAttribute.cs # XenModel/BrandManager.cs # XenModel/Messages.Designer.cs # XenModel/Messages.resx		2021-05-25 15:51:42 +01:00
..
ISCSIPopulateIQNsAction.cs	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
ISCSIPopulateLunsAction.cs	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00
SrAction.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
SrIntroduceAction.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
SrProbeAction.cs	Pascal-cased method name.	2021-03-02 11:57:50 +00:00
SrReattachAction.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
SrRefreshAction.cs	CP-33153: Added friendly title and description for GFS2_CAPACITY alert. Corrected scan action description.	2020-06-05 11:50:49 +01:00
SrRepairAction.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
SrScanAction.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
SrTrimAction.cs	Do not localise log entries or ellipsise names. Log exception stack traces where applicable.	2019-11-13 12:31:44 +00:00