Mihaela Stoica ff05fb698c Merge remote-tracking branch 'upstream/master' into REQ-477 ... Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> # Conflicts: # XenModel/XenAPI/Auth.cs # XenModel/XenAPI/Blob.cs # XenModel/XenAPI/Bond.cs # XenModel/XenAPI/Console.cs # XenModel/XenAPI/Converters.cs # XenModel/XenAPI/Crashdump.cs # XenModel/XenAPI/DR_task.cs # XenModel/XenAPI/Event.cs # XenModel/XenAPI/Feature.cs # XenModel/XenAPI/GPU_group.cs # XenModel/XenAPI/Host.cs # XenModel/XenAPI/Host_cpu.cs # XenModel/XenAPI/Host_crashdump.cs # XenModel/XenAPI/Host_metrics.cs # XenModel/XenAPI/Host_patch.cs # XenModel/XenAPI/JsonRpcClient.cs # XenModel/XenAPI/LVHD.cs # XenModel/XenAPI/Maps.cs # XenModel/XenAPI/Message.cs # XenModel/XenAPI/Network.cs # XenModel/XenAPI/PBD.cs # XenModel/XenAPI/PCI.cs # XenModel/XenAPI/PGPU.cs # XenModel/XenAPI/PIF.cs # XenModel/XenAPI/PIF_metrics.cs # XenModel/XenAPI/PUSB.cs # XenModel/XenAPI/PVS_cache_storage.cs # XenModel/XenAPI/PVS_proxy.cs # XenModel/XenAPI/PVS_server.cs # XenModel/XenAPI/PVS_site.cs # XenModel/XenAPI/Pool.cs # XenModel/XenAPI/Pool_patch.cs # XenModel/XenAPI/Pool_update.cs # XenModel/XenAPI/Role.cs # XenModel/XenAPI/SDN_controller.cs # XenModel/XenAPI/SM.cs # XenModel/XenAPI/SR.cs # XenModel/XenAPI/Secret.cs # XenModel/XenAPI/Session.cs # XenModel/XenAPI/Subject.cs # XenModel/XenAPI/Task.cs # XenModel/XenAPI/Tunnel.cs # XenModel/XenAPI/USB_group.cs # XenModel/XenAPI/User.cs # XenModel/XenAPI/VBD.cs # XenModel/XenAPI/VBD_metrics.cs # XenModel/XenAPI/VDI.cs # XenModel/XenAPI/VGPU.cs # XenModel/XenAPI/VGPU_type.cs # XenModel/XenAPI/VIF.cs # XenModel/XenAPI/VIF_metrics.cs # XenModel/XenAPI/VLAN.cs # XenModel/XenAPI/VM.cs # XenModel/XenAPI/VMPP.cs # XenModel/XenAPI/VMSS.cs # XenModel/XenAPI/VM_appliance.cs # XenModel/XenAPI/VM_guest_metrics.cs # XenModel/XenAPI/VM_metrics.cs # XenModel/XenAPI/VTPM.cs # XenModel/XenAPI/VUSB.cs # XenModel/XenModel.csproj		2018-02-27 17:42:18 +00:00
..
CrossPoolMigrateWizard/Filters	CA-242134: Remove TampaOrGreater, its usages and unreachable code	2017-05-05 14:31:43 +01:00
ExportWizard	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
PatchingWizard	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
BallooningWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
BugToolWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
CrossPoolMigrateCanMigrateFilterTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
CrossPoolMigrateWizardTest.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
DRFailoverWizardSummaryReportTests.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
DRFailoverWizardTests.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
ExportWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
HAWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
ImportWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
NewNetworkWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
NewPolicyWizardTest.cs	CA-265044: Updated test.	2017-09-11 13:40:29 +01:00
NewSRWizardTest.cs	CP-25563: Build now passes unit tests	2017-12-04 10:53:58 +00:00
NewVMWizardBiosStringsTest.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
NewVMWizardDisklessVMs.cs	Converted all extension get properties of the API classes to methods in order to	2017-09-03 03:35:30 +01:00
NewVMWizardStorageTest.cs	Converted remaining extension get and set properties of the API classes to methods	2017-09-05 02:15:38 +01:00
NewVMWizardTest.cs	Converted remaining extension get and set properties of the API classes to methods	2017-09-05 02:15:38 +01:00
ResidentHostIsSameAsSelectionFilterTests.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
RollingUpgradeWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
UpdatesWizardTest.cs	CA-176169: Changed copyright statements to include the comma in Citrix Systems,	2017-01-16 19:59:50 +00:00
WizardTest.cs	Merge branch 'master' into REQ-420	2018-01-25 13:38:58 +00:00