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
..
Cache.cs	New API class for certificates.	2020-04-01 16:27:13 +01:00
CancelledException.cs	CP-36392 pt.1: Removed unused using directives.	2021-04-07 10:04:47 +01:00
ConnectionsManager.cs	Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib.	2017-11-30 13:56:32 +00:00
ConnectTask.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
DisconnectionException.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
Heartbeat.cs	CA-286574: Fixed issue where the DR metadata were not loaded from the VDI because	2018-04-09 10:45:27 +01:00
HTTPHelper.cs	CA-345342: Cope with optional parameters in the HTTP_actions.	2021-02-10 23:45:23 +00:00
ICache.cs	New API class for certificates.	2020-04-01 16:27:13 +01:00
IXenConnection.cs	Simplified signature of connection events.	2019-12-06 11:17:46 +00:00
NetworkingHelper.cs	New bindings (includes CP-29452, CA-75634, CA-280976).	2020-02-14 14:43:22 +00:00
SessionFactory.cs	Corrections as per code review.	2018-01-24 15:58:16 +00:00
XenConnection.cs	CP-31105: Replaced the hardcoded name patterns in the resource files with format placeholders.	2021-03-31 11:50:32 +01:00