Mihaela Stoica
f46f424003
Merge pull request #1835 from jijiang/CA-270619
...
CA-270619: update XC credits.xml
2017-10-27 13:31:39 +01:00
Mihaela Stoica
79e7e5791d
Merge pull request #1838 from michael2012z/private/fengyangz/CA-270498
...
CA-270498: Link Help docs to new added USB-passthrough pages.
2017-10-27 11:06:20 +01:00
Michael Zhao
17a2fbc263
CA-270498: Revert changes introduced by VS.
2017-10-27 17:08:38 +08:00
Michael Zhao
ba7615e104
CA-270498: Link Help docs to new added USB-passthrough pages.
2017-10-27 13:11:20 +08:00
Mihaela Stoica
0d41c62a01
Merge pull request #1837 from vetrivelc/master
...
L10N:CA-261954,CA-270715 & CA-270716 Truncation Fixes
2017-10-26 15:23:35 +01:00
Ji Jiang
235a2e3c54
CA-270619: update XC credits.xml and maintainers
...
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-26 12:57:21 +01:00
vetrivelc
102b2d096f
L10N:CA-261954,CA-270715 & CA-270716 Truncation Fixes
2017-10-26 15:36:54 +05:30
Mihaela Stoica
b631b56138
Merge pull request #1836 from katshann/master
...
Update the XC help file for Inverness
2017-10-26 09:32:06 +01:00
katshann
01dbb78fc2
Update the XC help file for Inverness
2017-10-25 16:02:35 +01:00
Mihaela Stoica
de32523d04
Merge pull request #1834 from vetrivelc/master
...
L10N: Fixed [XenServer] fix in zh-CN resource
2017-10-25 09:38:35 +01:00
vetrivelc
06e11b5852
L10N: Fixed [XenServer] fix in zh-CN resource
2017-10-25 14:03:27 +05:30
Mihaela Stoica
95323239a0
Merge pull request #1827 from vetrivelc/master
...
L10N:Translation Updates
2017-10-25 08:48:23 +01:00
Mihaela Stoica
d182041718
Merge pull request #1826 from GaborApatiNagy/master_gfs2
...
CP-25257: Resurrect old code for GFS2 SR
2017-10-24 15:28:15 +01:00
Ji Jiang
92db28f62a
CA-270505: Use generic msg if VM migr not allowed
...
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-24 15:08:35 +01:00
Gabor Apati-Nagy
59b904eb2d
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Fix earlier resolved conflicts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-24 14:55:07 +01:00
Mihaela Stoica
0611fa0b4e
Merge pull request #1832 from xenserver/REQ-158
...
REQ-158: USB-passthrough feature
2017-10-24 13:45:03 +01:00
Mihaela Stoica
1d315db643
Remove unneeded empty folder from XenAdmin.csproj
2017-10-24 13:33:53 +01:00
Mihaela Stoica
b3312b6ed5
Merge pull request #1831 from michael2012z/REQ-158-merge
...
REQ-158: Merge latest master branch to fix conflicts.
2017-10-24 12:23:00 +01:00
Michael Zhao
b093082bcd
REQ-158: Merge master to fix conflicts.
2017-10-24 18:51:24 +08:00
Ji Jiang
0390bc3f6e
CA-265405: Fix string bug in vmss history dialog
...
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-24 10:40:46 +01:00
Mihaela Stoica
d09f75feda
Merge pull request #1828 from michael2012z/private/fengyangz/CA-270430
...
CA-270430: Hide USB property page when template or PV is selected.
2017-10-24 09:16:18 +01:00
Michael Zhao
8749e38732
CA-270430: Hide USB property page when template or PV is selected.
...
Signed-off-by: Michael Zhao <fengyang.zhao@citrix.com>
2017-10-24 14:23:55 +08:00
Gabor Apati-Nagy
033e7df8af
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Fix earlier resolved conflicts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-23 15:05:25 +01:00
vetrivelc
d05fd0efd3
L10N:Translation Updates
2017-10-23 19:01:14 +05:30
Mihaela Stoica
70ccbd4884
Merge pull request #1824 from makunterry/private/kunm/CP-25329
...
CP-25329: Refine API reference for PUSB & VUSB in xenadmin
2017-10-23 13:00:54 +01:00
Kun Ma
f0722e7a65
CA-270408: Refine add child node order in AttachUsbDialog
...
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-23 18:12:39 +08:00
Kun Ma
26aefe5a5d
CP-25329: sanity check in UsbPage.cs for usbgroup
...
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-23 15:33:10 +08:00
Mihaela Stoica
304b2c9fab
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Changes following code review
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-20 11:06:16 +01:00
Mihaela Stoica
6249663ae2
CP-17098: Integrate gfs2 in New SR wizard for HBA and FCOE SRs
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Conflicts:
XenAdmin/Wizards/NewSRWizard.cs
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoHBA.cs
XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
2017-10-20 11:05:45 +01:00
Mihaela Stoica
3bab5186f8
CP-16484: Integrate gfs2 in New SR wizard for iSCSI SRs
...
Rename SrWizardType
2017-10-20 10:42:54 +01:00
Mihaela Stoica
a56338861c
CP-16484: Integrate gfs2 in New SR wizard for iSCSI SRs
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
Conflicts:
XenAdmin/Wizards/NewSRWizard_Pages/Frontends/LVMoISCSI.cs
XenAdmin/Wizards/NewSRWizard_Pages/SrWizardType.cs
XenAdmin/XenAdmin.csproj
2017-10-20 10:42:35 +01:00
Mihaela Stoica
b23ec8136a
CP-16480: Add gfs2 to the list of XenCenter known sr types
...
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
Conflicts:
XenModel/FriendlyNames.Designer.cs
XenModel/FriendlyNames.resx
XenModel/XenAPI-Extensions/SR.cs
2017-10-20 10:34:56 +01:00
Kun Ma
1889cbafbd
CP-25329: Refine API reference for PUSB & VUSB in xenadmin
...
Signed-off-by: Kun Ma <kun.ma@citrix.com>
2017-10-20 17:30:21 +08:00
Mihaela Stoica
3eaa332bc3
Merge pull request #1822 from michael2012z/private/fengyangz/CA-269722
...
private/fengyangz/CA-269722: sync resource files for I18N
2017-10-19 09:41:19 +01:00
Michael Zhao
79703f40ff
CA-269722: Sync resource files for I18N.
2017-10-19 11:24:20 +08:00
Gabor Apati-Nagy
4630994198
Merge pull request #1797 from mcintyre94/CP-24974
...
[CP-24974] Avoid calculatingVM agility/failure tolerance twice
2017-10-18 15:58:27 +01:00
Michael
a375c8a119
CP-25081: Set platform parameters. ( #1820 )
...
* CP-25081: Set platform parameters.
* Optimize qemu-upstream handling code.
* Support Enter/Esc keyboard handling in AttachUsbDialog.
* Fix a logic error in showing qemu-upstream warning.
* Update bindings from REQ-158 XenServer build 129.
2017-10-18 12:52:53 +01:00
Mihaela Stoica
08cce7cb1d
Merge pull request #1821 from GaborApatiNagy/master_CA-265225
...
[SCTX-2608] Honolulu Update - Server is still booting error
2017-10-18 10:00:11 +01:00
Gabor Apati-Nagy
8297314499
[SCTX-2608] Honolulu Update - Server is still booting error
...
Increased the wait between host_enable attempts, allowing to wait more for the host to reboot.
This will affect Automated Updates and other normal Patching Wizard
operations as well.
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-18 09:56:35 +01:00
Joey
2dc9c00e41
Merge pull request #1817 from GaborApatiNagy/master_new
...
CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
2017-10-18 09:53:51 +01:00
Gabor Apati-Nagy
b795938b66
CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
...
Moved some code that is only needed for pre-Ely hosts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-18 09:36:35 +01:00
Mihaela Stoica
2b7c0acb04
Merge pull request #1819 from jijiang/master
...
Update XC XenAPI binding based on XS master
2017-10-17 11:40:01 +01:00
Ji Jiang
5fb9442632
Update XC XenAPI binding based on XS master
...
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-17 11:37:37 +01:00
Michael
16b52d1c3f
CP-25081: UI improvements for USB passthrough ( #1811 )
...
* CP-25081: UI improvements for USB passthrough
* CP-25081: Show text when AttachUsbDialog list is empty.
* Fix comments.
* Improve the presentation of warnings in USBEditPage.
* Update warning text of attach usb dialog.
* Simplify the layout of Attach USB Dialog.
* Check if USB devices plugged before showing UI.
* Fix comments.
* Fix comments.
* Improve code.
2017-10-17 09:57:50 +01:00
Mihaela Stoica
405ea9a9b1
Merge pull request #1818 from jijiang/master
...
CA-268557: Fix the hosts order in Patching Wizard
2017-10-17 08:41:54 +01:00
Ji Jiang
e4ee106366
CA-268557: Fix the hosts order in Patching Wizard
...
Signed-off-by: Ji Jiang <ji.jiang@citrix.com>
2017-10-16 11:52:08 +01:00
Gabor Apati-Nagy
b589d0dd9e
CA-267330: [Update Wizard Improvements] The Update wizard: block the installation of an update on slaves if a reboot or a toolstack restart is pending on master
...
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-10-13 13:55:19 +01:00
Joey
2c2d5bf164
Merge pull request #1815 from MihaelaStoica/master
...
CA-268975: Do not allow multiple hosts to join the pool if the new po…
2017-10-13 12:23:23 +01:00
Mihaela Stoica
b2c779fb85
Merge pull request #1814 from jijiang/master
...
CA-267671: Fix Configure HA wizard display text
2017-10-13 11:40:50 +01:00
Mihaela Stoica
4a6b860f3d
CA-268975: Do not allow multiple hosts to join the pool if the new pool size will exceed the max size
...
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2017-10-13 10:14:00 +01:00