xenadmin/XenModel
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
..
Actions Merge remote-tracking branch 'upstream/master' into REQ-477 2018-02-27 17:42:18 +00:00
Alerts Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
CustomFields CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Mappings CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Network Merge remote-tracking branch 'upstream/master' into REQ-477 2018-02-27 17:42:18 +00:00
Properties Added basic unit tests for the JsonConverters. 2018-02-14 11:10:03 +00:00
ServerDBs Merge branch 'master' into REQ-420 2018-01-25 13:38:58 +00:00
StorageLinkAPI CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Utils Merge branch 'master' into REQ-420 2018-01-25 13:38:58 +00:00
WLB CA-40854: The Session's uuid is in reality its opaque_ref. Use the opaque_ref so 2018-02-21 14:08:01 +00:00
XenAPI Merge remote-tracking branch 'upstream/master' into REQ-477 2018-02-27 17:42:18 +00:00
XenAPI-Extensions Merge remote-tracking branch 'upstream/master' into REQ-477 2018-02-27 17:42:18 +00:00
XenSearch CA-40854: The Session's uuid is in reality its opaque_ref. Use the opaque_ref so 2018-02-21 14:08:01 +00:00
XenServerProxy CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
DockerContainer.cs Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
DockerContainers.cs Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
Folder.cs Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
Folders.cs Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
FriendlyNames.Designer.cs Merge master into REQ-477 2018-01-15 14:41:40 +00:00
FriendlyNames.ja.resx L10N: Translation Checkins 2017-11-22 16:03:36 +05:30
FriendlyNames.resx Merge master into REQ-477 2018-01-15 14:41:40 +00:00
FriendlyNames.zh-CN.resx L10N: Translation Checkins 2017-11-22 16:03:36 +05:30
HealthCheckSettings.cs Converted all extension get properties of the API classes to methods in order to 2017-09-03 03:35:30 +01:00
I18NException.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Icons.cs CP-24708: Show different unlicensed pool/host icon 2017-09-27 11:30:12 +01:00
InvisibleMessages.Designer.cs CA-276732: Replaced "Buy XenServer online" link 2018-01-12 12:11:46 +00:00
InvisibleMessages.ja.resx CA-276732: Replaced "Buy XenServer online" link 2018-01-12 12:11:46 +00:00
InvisibleMessages.resx CA-276732: Replaced "Buy XenServer online" link 2018-01-12 12:11:46 +00:00
InvisibleMessages.zh-CN.resx CA-276732: Replaced "Buy XenServer online" link 2018-01-12 12:11:46 +00:00
InvokeHelper.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Messages.Designer.cs Merge pull request #1914 from serencorbett1/REQ-477 2018-01-18 15:39:51 +00:00
Messages.ja.resx Rename resource string which causes Messages.resx to become unsorted 2018-01-11 12:45:37 +00:00
Messages.resx Merge pull request #1914 from serencorbett1/REQ-477 2018-01-18 15:39:51 +00:00
Messages.zh-CN.resx Rename resource string which causes Messages.resx to become unsorted 2018-01-11 12:45:37 +00:00
ObjectChange.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
OtherConfigWatcher.cs CA-257927: Changed ChangeableList.RemoveAll method to fire the CollectionChangedEvent 2017-07-24 14:48:02 +01:00
PoolJoinRules.cs CA-268975: Do not allow multiple hosts to join the pool if the new pool size will exceed the max size 2017-10-13 10:14:00 +01:00
RbacMethod.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
StringExtensions.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
Tags.cs Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 2017-11-30 13:56:32 +00:00
TimeSpanExtensions.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00
XenAdminConfigManager.cs CP-22472: Add new XenCenter metadata file to the server status report: changes following code review 2017-07-03 17:25:04 +01:00
XenModel.csproj Merge remote-tracking branch 'upstream/master' into REQ-477 2018-02-27 17:42:18 +00:00
XenObjectDownloader.cs Merge branch 'master' into REQ-420 2018-01-25 13:38:58 +00:00
XenServerPlugins.cs CA-176169: Changed copyright statements to include the comma in Citrix Systems, 2017-01-16 19:59:50 +00:00