Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-03 09:40:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,795 Commits 12 Branches 48 Tags 186 MiB
0e55a4f078
Commit Graph

2884 Commits

Author SHA1 Message Date
Konstantina Chremmou
19de8c54b5 CA-280679: Fixed issue where the TabPage plugin could not handle Ipv6 addresses. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-01-29 10:17:27 +00:00
Konstantina Chremmou
123db499f5 Merge branch 'master' into REQ-420 2018-01-25 13:38:58 +00:00
Konstantina Chremmou
99f9a70189 Connection code simplification/update: removed CachePopulatedEventArgs class and use the newer Action delegate instead. 
Also, changed the access modifiers of several members to private, because they don't need to be exposed outside the parent class.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2018-01-24 15:58:16 +00:00
Mihaela Stoica
deb953a6ff CA-280287: Fix the null reference exception on the Import wizard (#1918) 
* CA-280287: Fix the null reference exception on the Import wizard

- Added a check so that we don't attempting to show the license warning if the wizard is open without a preselected host/pool.
- The license warning is now updated whenever the host selection changes; plus, we are not attempting to show it if the wizard is open without a preselected host/pool.

- Also a minor refactoring in the GlobalSelectHost page to fix this issue: when the wizard is open with a pre-selected host, we pass this to the page by assigning SelectedHost property, which in turn sets the m_selectedHost. The getter for SelectedHost  resets m_selectedHost to the selected item in the host list. If the getter is used before the host list selection is updated, then the desired pre-selection is lost, because m_selectedHost is reset to null.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

* CA-280287: Corrections following code review

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-19 14:05:20 +00:00
Mihaela Stoica
babf201d2a CA-276678: Add "Buy licenses" link in the patching wizard when the precheck fails with license restriction 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-19 13:11:00 +00:00
Mihaela Stoica
b9e85f93d5
Merge pull request #1914 from serencorbett1/REQ-477 
CP-26253: changed "images" to "virtual disks" to avoid confusion
 2018-01-18 15:39:51 +00:00
Mihaela Stoica
5fb9709b8a Merge master into REQ-477 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

# Conflicts:
#	XenModel/FriendlyNames.resx
#	XenModel/Messages.resx
#	XenModel/XenAPI/ApiVersion.cs
 2018-01-15 14:41:40 +00:00
Mihaela Stoica
6cefd4d202 CA-276976: Add a new precheck in the Update Wizard 
- The new "server selection" precheck is added for Inverness or greater pools and checks if all the servers in the pool are selected (if update not already applied) when applying an update that has the "enforce-homogeneity" flag set to true

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-12 14:34:50 +00:00
serenc
92a809e433 CP-26253: changed "images" to "virtual disks" to avoid confusion 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2018-01-12 14:05:01 +00:00
Mihaela Stoica
018dfb8e79 Rename resource string which causes Messages.resx to become unsorted 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2018-01-11 12:45:37 +00:00
serencorbett1
16d0c1cc77 CP-26253: Added changes to UI based on feedback (#1906) 
* CP-26253: Added changes to UI based on feedback

Signed-off-by: serenc <seren.corbett@citrix.com>

* CP-26253: Corrected spelling mistake

Signed-off-by: serenc <seren.corbett@citrix.com>

* CP-26253: Changed "Thin Provisioning (GFS2) SRs"  to "thinly provisioned"

Signed-off-by: serenc <seren.corbett@citrix.com>
 2018-01-10 15:13:55 +00:00
Mihaela Stoica
13a8b26fc4 Merge release/jura/master into REQ-637 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

# Conflicts:
#	XenModel/Utils/Helpers.cs
 2017-12-19 13:12:39 +00:00
Mihaela Stoica
ffa42c086b CP-26290: Add new edition 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-18 13:22:17 +00:00
Michael
035f4c234e CA-272797: Limit user to select 8 SRs at most in DR Configure dialog. (#1896) 
* CA-272797: Limit user to select 8 SRs at most in DR Configure dialog.

Signed-off-by: Michael Zhao <michael.zhao@citrix.com>
 2017-12-18 09:55:45 +00:00
Gabor Apati-Nagy
00040b5761
Merge pull request #1897 from MihaelaStoica/REQ-477 
CP-26131: IP Address Configuration when clustering is enabled
 2017-12-15 11:11:40 +00:00
serencorbett1
89ae8534fa CP-26193: Disable remove IP address button when clustering enabled on… (#1898) 
* CP-26193: Disable remove IP address button when clustering enabled on network

* CP-25967: Combine two if statements

* CP-25967: Changed ClusteringEnabled boolean method

* CP-25967: Removed var

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-15 11:09:26 +00:00
Mihaela Stoica
080b69befa CP-26131: Use SR.GetSR.GetSRType()instead of type 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-15 10:47:12 +00:00
Gabor Apati-Nagy
3a076e21c6 CP-26048: Improve the fix for CA-271775 (console tab) 
Fixed typo

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-12-13 10:48:23 +00:00
Gabor Apati-Nagy
a01a4b9855 CP-26048: Improve the fix for CA-271775 (console tab) 
Improved message (when using an outdated RDP client)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-12-13 10:48:23 +00:00
Gabor Apati-Nagy
9b6806de1b CP-26048: Improve the fix for CA-271775 (console tab) 
Reserved space for the warning message that is displayed if the XC machine is running an older version of the RDP control

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-12-13 10:48:23 +00:00
serencorbett1
f4d501474a CP-25564: Changed clusteringEnabled variable (#1891) 
* CP-25564: Changed clusteringEnabled variable

* CP-26026: Added a link to enable clustering on SR Wizard

* CP-26026: Tweaked according to PR feedback

* CP-25967: Added license restriction for GFS2

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-12 13:36:09 +00:00
Mihaela Stoica
1e08eb2371
Merge pull request #1890 from jishengx/private/jishengx/CA-272130 
CA-272130: modify truncated linklabel and text on the memory settings wizard
 2017-12-07 13:53:03 +00:00
Gabor Apati-Nagy
a2a5f4eaeb
Merge pull request #1888 from michael2012z/private/fengyangz/CA-271863 
CA-271863: Can not automatically resolve autostart-enabled VM in RPU.
 2017-12-07 11:12:31 +00:00
Jisheng Xing
449dfe7f56 CA-272130: modify truncated linklabel and text on the memory settings wizard 2017-12-07 17:28:03 +08:00
Michael Zhao
10afdbc541 CA-271863: Update max waiting time to 5 seconds to handle extreme cases. 2017-12-07 13:03:06 +08:00
serenc
d3be7848f1 CP-25564: pif.host.opaque_ref 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-06 13:50:55 +00:00
Michael
1d0a2b76a0 CA-272769: Enable user to cancel URL testing in rolling upgrade wizard. (#1882) 
* CA-272769: Enable user to cancel URL testing in rolling upgrade wizard.

* CA-272769: Sort messages resource file.
 2017-12-06 12:06:36 +00:00
serenc
1b4f2c4e32 CP-25564: Deleted tags 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-06 09:53:52 +00:00
serenc
3532e9b586 CP-25563: Improved code from feedback 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-06 09:49:56 +00:00
Michael Zhao
1cf6b55368 CA-271863: Can not automatically resolve autostart-enabled VM in RPU. 2017-12-06 15:57:07 +08:00
serenc
7790bed4ca Merge remote-tracking branch 'upstream/REQ-477' into REQ-477 
Signed-off-by: serenc <seren.corbett@citrix.com>

# Conflicts:
#	XenAdmin/Dialogs/NetworkingPropertiesPage.cs
#	XenAdmin/Help/HelpManager.resx
 2017-12-05 11:16:16 +00:00
serenc
ea7c9b76f2 CP-25564: Added condition for maintenance mode and clustering 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-05 10:50:56 +00:00
serenc
dd2bde777a CP-25564: Disable IP configuration if clustering is enabled 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 16:51:14 +00:00
serenc
f430cf58c8 CP-25563: Corrected column layout of tableLayoutInfo 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 15:57:12 +00:00
serenc
00aa042bd7 CP-25563: Added hotkeys,changed flowLayout and corrected label alignment 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 13:50:52 +00:00
Mihaela Stoica
72071a3334 Merge master into REQ-477 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenModel/XenAPI/Proxy.cs
 2017-12-04 13:37:12 +00:00
serenc
40ac7c9a2f CP-25563: Correct Label Name 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 11:29:02 +00:00
serenc
69edc172eb CP-25563: Build now passes unit tests 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 10:53:58 +00:00
Mihaela Stoica
0c00308d66
Merge pull request #1883 from serencorbett1/REQ-477 
CP-25563: Changed wording of text
 2017-12-04 10:03:57 +00:00
serenc
81ad9efe6b CP-25563: Changed wording of text 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-04 09:51:09 +00:00
Mihaela Stoica
ea91951389 CP-26114: Hide the GFS2 option for FCoE 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-01 15:59:00 +00:00
Mihaela Stoica
47056f15e5 CP-25563: Change AutoScaleMode to Dpi on the Clustering page 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-01 15:34:28 +00:00
Mihaela Stoica
1e4c293300 CP-26021: Update the GFS2 SR creation with the new syntax 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-12-01 15:27:42 +00:00
serenc
9f9754c8b0 CP-25563: Added Clustering page 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-12-01 14:47:50 +00:00
Konstantina Chremmou
fb8434819d Namespace tidy 3/several: replaced XenAdmin.Core (instances in XenCenterLib) with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
7f1ee0b30e Namespace tidy 2/several: replaced XenAdmin with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
566c6f0219 Namespace tidy 1/several: replaced Citrix.XenCenter with XenCenterLib. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:56:32 +00:00
Konstantina Chremmou
41203bccee Small layout issues on the LegalNotices dialog: 
- the dialog had no minimum size
- although resizable, the dialog had no grip
- one of the labels was not autosized

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:37:40 +00:00
Konstantina Chremmou
5320f90939 REQ-420: Added legal notice for JSON.NET. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2017-11-30 13:35:15 +00:00
serenc
0f752ea035 CP-25551: Changed Page order and removed Event Handler from Designer 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-29 13:34:48 +00:00
serencorbett1
584b214ac1 CA-272131 Added messages to show status of autostart (#1857) 
* CA-272131 Added messages to show status of autostart

* CA-272131 Tidied Disable and Enable Autostart Messages

* CA-272131: Changed parameter

Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-29 09:51:19 +00:00
Mihaela Stoica
343311635d
Merge pull request #1872 from michael2012z/private/fengyangz/CA-272606 
CA-272606: AD user can not log out when closing XenCenter.
 2017-11-28 14:31:38 +00:00
serenc
7e7a6d9c46 CP-25551 and CP-25565: Updated branch based on PR comments 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 13:34:38 +00:00
serenc
5bb7a07711 CP-25551: Added Provisioning Page to the Wizard 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-28 10:51:44 +00:00
Michael Zhao
44851325fe CA-272606: AD user can not log out when closing XenCenter. 2017-11-27 14:50:05 +08:00
Konstantina Chremmou
23a9c50389 Merge remote-tracking branch 'upstream/master' into REQ-420 2017-11-23 14:07:21 +00:00
serenc
c4b228e8da CP-25551: Change Type page, Add provisioning page 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-23 10:59:15 +00:00
Vetrivel Chinnasamy
5f594dae8a L10N: Translation Checkins 2017-11-22 16:03:36 +05:30
Gabor Apati-Nagy
89dc52bb3d
Merge pull request #1862 from MihaelaStoica/CA-273307 
CA-273307: Replaced the links in the Upsell dialogs
 2017-11-17 16:59:34 +00:00
Mihaela Stoica
b3a1de34ad CA-274150: Update RPU hotfixes in XenCenter 
- RPU004 is applicable to Falcon as well as Ely hosts

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-17 16:48:40 +00:00
Mihaela Stoica
681f77bfd9 CA-273307: Replaced the links in the Upsell dialogs 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-17 12:24:43 +00:00
Konstantina Chremmou
a170ec33e2 Merge remote-tracking branch 'upstream/master' into REQ-420 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>

# Conflicts:
#	autogenerated XenModel/XenAPI/* files
 2017-11-17 11:53:41 +00:00
Gabor Apati-Nagy
0a8f9b8aa1
Merge pull request #1855 from serencorbett1/master 
CA-273674 Added warning when shutting down pool master
 2017-11-17 10:43:53 +00:00
serenc
6b8705dcc5 CA-273674 Removed unnecessary assignments 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-17 10:07:14 +00:00
serenc
500d069143 CA-273674 Refactored using strings 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-16 15:16:55 +00:00
Michael Zhao
8b811d6e2d CA-272724: Missing user information in non-English XenCenter version. 2017-11-16 15:37:24 +08:00
Mihaela Stoica
2d39c8e538
Merge pull request #1856 from GaborApatiNagy/master_rdpstuff 
CA-271775 and Revert CA-247333
 2017-11-15 08:06:52 +00:00
Mihaela Stoica
188fd5ca6e CA-266926: Remove unused function 2017-11-13 17:09:36 +00:00
Mihaela Stoica
6ab0fb7ba5 CA-266926: Change the description of the LICENSE_EXPIRES_SOON alert message 
... to avoid descriptions like "The license on host 'A' will expire at Never"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-13 17:09:36 +00:00
Gabor Apati-Nagy
5b2ef0e7eb CA-271775: Showing an info message if XC falls back to an earlier RDP version 
Eg. Windows 7 users (pre-updates)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-11-13 16:51:56 +00:00
katshann
f296319c5d Updating 2 localised CHMs (#1854) 
* L10n: Localized files with fix

Remove artifacts introduced by XTM
 2017-11-13 15:51:40 +00:00
serenc
e041b2d2b9 CA-273674 Added warning when shutting down pool master 
Signed-off-by: serenc <seren.corbett@citrix.com>
 2017-11-13 15:07:32 +00:00
Mihaela Stoica
69abd285e2 Update credits 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-13 11:35:16 +00:00
Mihaela Stoica
7f602a782a CA-271970: Incorrect error when copying a VM on an unlicensed pool 
Instead of showing the cross-pool migration upsell dialog, we now show the wizard, where user can try to perform an intra-pool copy (the cross-pool option is disabled with an explanatory message displayed)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-11-13 11:28:00 +00:00
katshann
8a62b70b8c New CHMs (#1849) 
* L10n: Inverness

build_chm # 24

* Revert "L10n: Inverness"

This reverts commit 8b41bb8c79cd4d73ed6021a5533cf7624a5421c4.

* L10n: Inverness

CHMs from build_chm master-l10n #24

Second attempt at checkin with a merge conflict resolve. (I hope)
 2017-11-10 13:49:05 +00:00
Callum McIntyre
245b17885e [CA-269110] Add the VM wizard button before enabling dropdown items 
We always add the VM wizard button to the migrate dropdown, but it's
currently not added until the end of the enable loop - after we've
calculated whether we can boot on each host. There's no reason to wait
until we've done all that before showing the wizard, so add it straight
away to the end of the list before the loop.

Signed-off-by: Callum McIntyre <callum.mcintyre@citrix.com>
 2017-11-09 16:59:25 +00:00
Callum McIntyre
479d4b4b87 [CA-269110] Stop calling assert_can_boot_here after migrate dropdown is closed 
When we right click migrate a VM we load all the hosts in the pool into
a dropdown, and then one-by-one assert whether the selected VM can boot
on that host, enabling each option where this is positive. If the
dropdown is exited then nothing stops these assert calls from
continuing, and looking at the logs we can see that they do.

With a large pool this is problematic because the UI basically locks up
until it's completed all these asserts, even if we've already selected a
host to migrate to. If we try to migrate another host then we see in the logs that both the old thread and new
thread are making `assert_can_boot_here` calls, and the UI for the new
thread doesn't function until the old one has finished.

This commit adds a new property `_isDropDownClosed`, which is set by the
new `OnDropDownClosed` event handler. In the loop enabling dropdown
items, each iteration we check this property - and if it is true then
the dropdown is no longer showing so we stop the loop and thus don't
call any more `assert_can_boot_here` commands. This stops the UI locking
up after the dropdown is closed.

Signed-off-by: Callum McIntyre <callum.mcintyre@citrix.com>
 2017-11-09 16:59:25 +00:00
Gabor Apati-Nagy
74cf3d03b3 Revert "CA-247333 - Remove rdpclient6 code after April 2017 when it will become redundant" 
This reverts commit 5e458ac234.
 2017-11-06 11:28:07 +00:00
Letsibogo Ramadi
b437b530a5 Revert "CA-247333 - Remove rdpclient6 code after April 2017 when it will become redundant" 
This reverts commit cca0ab5d89.
 2017-11-06 11:27:49 +00:00
Vetrivel Chinnasamy
282ea74224 L10N:CA-270723 Translation Checkins 2017-11-03 16:42:41 +05:30
Gabor Apati-Nagy
a9dba64c93
Merge pull request #1840 from MihaelaStoica/master 
Update XenCenter help
 2017-10-31 14:20:11 +00:00
Gabor Apati-Nagy
93935e5e48
Merge pull request #1833 from jijiang/master 
CA-270505: Use generic msg if VM migr not allowed
 2017-10-31 14:18:46 +00:00
Joey
8932d983db
Merge pull request #1839 from GaborApatiNagy/master_CA-270499 
CA-270499: The license text on the title bar is flickering
 2017-10-31 14:06:46 +00:00
Mihaela Stoica
57eee1567c Update XenCenter help 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2017-10-31 12:29:09 +00:00
Gabor Apati-Nagy
dc95d8ded0 CA-270499: The license text on the title bar is flickering 
Fixed flickering that occurred due to the repetitive re-setting of the label's text.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2017-10-27 14:34:45 +01:00
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
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
katshann
01dbb78fc2 Update the XC help file for Inverness 2017-10-25 16:02:35 +01:00
Mihaela Stoica
95323239a0 Merge pull request #1827 from vetrivelc/master 
L10N:Translation Updates
 2017-10-25 08:48:23 +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
1d315db643 Remove unneeded empty folder from XenAdmin.csproj 2017-10-24 13:33:53 +01:00
Michael Zhao
b093082bcd REQ-158: Merge master to fix conflicts. 2017-10-24 18:51:24 +08: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