Alexander Schulz
|
cd477a4e18
|
Merge branch 'master' of https://github.com/xenserver/xenadmin into development
# Conflicts:
# Branding/Branding.resx
# Branding/HomePage.mht
# Branding/HomePage.zh-CN.mht
# Branding/Images/000_XenCenterAlerts_h32bit_24.png
# Branding/Images/DlgBmp.bmp
# Branding/Images/XS.png
# Branding/Images/about_box_graphic_423x79.png
# Branding/Images/alerts_32.png
# Branding/Images/splash.bmp
# Branding/Images/upsell_16.png
# Branding/Images/wizard_background.png
# CFUValidator/CFUValidator.csproj
# Jenkinsfile
# LICENSE
# MAINTAINERS
# README.md
# WixInstaller/XenCenter.wxs
# WixInstaller/branding.wxi
# WixInstaller/codepagechange.vbs
# WixInstaller/en-us.wxl
# WixInstaller/ja-jp.wxl
# WixInstaller/wix_src.patch
# WixInstaller/zh-cn.wxl
# XenAdmin.sln
# XenAdmin/Commands/Controls/ContextMenuBuilder.cs
# XenAdmin/Commands/Controls/MigrateVMToolStripMenuItem.cs
# XenAdmin/Commands/Controls/VMLifeCycleToolStripMenuItem.cs
# XenAdmin/Commands/CopyTemplateCommand.cs
# XenAdmin/Commands/CopyVMCommand.cs
# XenAdmin/Commands/CrossPoolCopyVMCommand.cs
# XenAdmin/Commands/CrossPoolMigrateCommand.cs
# XenAdmin/Commands/CrossPoolMoveVMCommand.cs
# XenAdmin/Commands/DragDropCrossPoolMoveHaltedVMCommand.cs
# XenAdmin/Commands/DragDropMigrateVMCommand.cs
# XenAdmin/Commands/MoveVMCommand.cs
# XenAdmin/ConsoleView/VNCTabView.cs
# XenAdmin/Core/Updates.cs
# XenAdmin/Dialogs/AboutDialog.resx
# XenAdmin/Dialogs/LegalNoticesDialog.cs
# XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.ja.resx
# XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.resx
# XenAdmin/Dialogs/WarningDialogs/LicenseWarningDialog.zh-CN.resx
# XenAdmin/Help/HelpManager.cs
# XenAdmin/Images.cs
# XenAdmin/MainWindow.Designer.cs
# XenAdmin/MainWindow.cs
# XenAdmin/MainWindow.ja.resx
# XenAdmin/MainWindow.resx
# XenAdmin/MainWindow.zh-CN.resx
# XenAdmin/Properties/Resources.Designer.cs
# XenAdmin/Properties/Settings.Designer.cs
# XenAdmin/Properties/Settings.settings
# XenAdmin/SettingsPanels/BootOptionsEditPage.cs
# XenAdmin/TabPages/GeneralTabPage.Designer.cs
# XenAdmin/TabPages/GeneralTabPage.cs
# XenAdmin/TabPages/GeneralTabPage.resx
# XenAdmin/VNC/VNCException.cs
# XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs
# XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateWizard.cs
# XenAdmin/Wizards/CrossPoolMigrateWizard/Filters/CrossPoolMigrateCanMigrateFilter.cs
# XenAdmin/Wizards/NewNetworkWizard_Pages/NetWTypeSelect.cs
# XenAdmin/Wizards/NewSRWizard.cs
# XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
# XenAdmin/XenAdmin.csproj
# XenAdmin/app.config
# XenAdminTests/ArchiveTests/ArchiveFactoryTests.cs
# XenAdminTests/ArchiveTests/ArchiveIteratorTests.cs
# XenAdminTests/ArchiveTests/ArchiveWriterTests.cs
# XenAdminTests/ArchiveTests/ThirdPartyArchiveWriterTests.cs
# XenAdminTests/CompressionTests/CompressionFactoryTests.cs
# XenAdminTests/CompressionTests/ThirdPartyCompressionStreamTests.cs
# XenAdminTests/HealthCheckTests/RequestUploadTaskTests.cs
# XenAdminTests/UnitTests/CPUMaskingTest.cs
# XenAdminTests/UnitTests/TimeUtilTests.cs
# XenAdminTests/UnitTests/WlbTests/WlbPoolConfigurationTests.cs
# XenAdminTests/UnitTests/WlbTests/WlbScheduledTaskTests.cs
# XenAdminTests/UnitTests/WlbTests/WlbScheduledTasksTests.cs
# XenAdminTests/XenAdminTests.csproj
# XenModel/Actions/HealthCheck/GetHealthCheckAnalysisResultAction.cs
# XenModel/Actions/HealthCheck/HealthCheckAuthenticationAction.cs
# XenModel/Actions/HealthCheck/UploadServerStatusReportAction.cs
# XenModel/Actions/HealthCheck/XenServerHealthCheckUpload.cs
# XenModel/Actions/VM/ImportVmAction.cs
# XenModel/Actions/VM/VMCrossPoolMigrateAction.cs
# XenModel/Actions/VM/VMPauseAction.cs
# XenModel/FriendlyNames.Designer.cs
# XenModel/FriendlyNames.ja.resx
# XenModel/FriendlyNames.resx
# XenModel/FriendlyNames.zh-CN.resx
# XenModel/HealthCheckSettings.cs
# XenModel/InvisibleMessages.Designer.cs
# XenModel/InvisibleMessages.ja.resx
# XenModel/InvisibleMessages.resx
# XenModel/InvisibleMessages.zh-CN.resx
# XenModel/Messages.Designer.cs
# XenModel/Messages.ja.resx
# XenModel/Messages.resx
# XenModel/Messages.zh-CN.resx
# XenModel/SshConsole.cs
# XenModel/Utils/Helpers.cs
# XenModel/XenAPI-Extensions/SR.cs
# XenModel/XenAPI/ApiVersion.cs
# XenModel/XenModel.csproj
# XenServerHealthCheck/Registry.cs
# scripts/check_copyright.ps1
# scripts/check_i18n.ps1
# scripts/check_spelling.ps1
# scripts/deps-map.json
# scripts/dictionary.txt
# scripts/download_hotfixes.ps1
# scripts/download_packages.ps1
# scripts/hotfix-map.json
# splash/util.h
# xe/Xe.csproj
# xe/app.manifest
|
2023-12-30 16:43:15 +01:00 |
|