Commit Graph

1582 Commits

Author SHA1 Message Date
Mihaela Stoica
f7e0f61093 Merge pull request #832 from stephen-turner/CA-198487
CA-198487: Log at Info level not Debug level
2016-02-12 12:22:28 +00:00
Stephen Turner
e940ed8bb0 CA-198487: Log at Info level not Debug level 2016-02-12 11:29:19 +00:00
Mihaela Stoica
7a46698141 CP-16068: Pick up new RPU hotfixes
- XenCenter build system picks up the RPU hotfixes from Artifactory
- RPU001 and RPU002 replace XS62E006 and XS65ESP1006
- Removed hotfixes from the solution, moved  XS60E001 to Branding folder
- also cleaned up code in the HotfixFactory class, removing MNR and Cowley hotfixes (not supported anymore)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-11 22:18:06 +00:00
Gabor Apati-Nagy
efe9c807b3 Merge pull request #827 from MihaelaStoica/rename
CP-16012: Rename branding variables
2016-02-10 15:19:29 +00:00
Gabor Apati-Nagy
98f5c06f18 Merge pull request #823 from MihaelaStoica/CA-198187
CA-198187: All images included in xenadmin project should appear in t…
2016-02-10 15:18:43 +00:00
Gabor Apati-Nagy
b211ab4a09 Merge pull request #821 from MihaelaStoica/CA-197388
CA-197388: Fix error where License Manager displays "Standard feature…
2016-02-10 15:18:23 +00:00
Mihaela Stoica
4263d2f152 Merge pull request #822 from GaborApatiNagy/CA-196315
CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging)
2016-02-10 13:40:51 +00:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 11:52:30 +00:00
Mihaela Stoica
acd2a52823 Fix null reference exception that can occur when running the tests
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 10:48:08 +00:00
Gabor Apati-Nagy
0834cdf559 Merge pull request #825 from MihaelaStoica/CP-15399
CP-15399: Changed Branding.cs so that only the constants get rebranded
2016-02-09 15:41:33 +00:00
Mihaela Stoica
040058924d CP-15399: Changed Branding.cs so that only the constants get rebranded
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-09 15:18:05 +00:00
Mihaela Stoica
272c753fdf Merge pull request #820 from stephen-turner/CA-194025
CA-194025: Variable $date-of-software replaced with actual year.
2016-02-08 17:10:39 +00:00
Mihaela Stoica
5f7a6abc5c CA-198187: All images included in xenadmin project should appear in the Images folder in solution explorer
- also removed some references to non-existent image files

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-08 16:51:29 +00:00
Gabor Apati-Nagy
39ae204363 Merge remote-tracking branch 'github_xenadmin/master' 2016-02-08 10:14:25 +00:00
Gabor Apati-Nagy
b8e447afa3 CA-196315: XS65ESP1018 not showing up in XenCenter Updates (on staging)
Fixed code to treat uuids of patches case-insensitive when consuming, but not changing them (eg. to lowercase) to keep compatibility with older XAPIs.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-08 10:14:05 +00:00
Mihaela Stoica
7b2a0c6922 CA-197388: Fix error where License Manager displays "Standard features only" for Premium edition
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-08 10:10:01 +00:00
Hui Zhang
73c8bf4604 CP-13123: Add two buttons on General Tab of docker container.
1. Add "View Console" and "View Log" on general tab of docker container.
2. Grey the two buttons if the container is on Windows (Server 2016) VM.
3. Enable the two buttons when the container is running on Linux VM.

Signed-off-by: Hui Zhang <hui.zhang@citrix.com>
2016-02-06 15:34:09 +08:00
Stephen Turner
e36cc9f6e0 Merge pull request #819 from ushamandya/master
CP-15481: Updated Migrate VMs, NFS, and SMB topics
2016-02-05 16:07:18 +00:00
Stephen Turner
9906cf561f CA-194025: Variable $date-of-software replaced with actual year.
I used the year the code was added to XenCenter: it may be older than that,
but I couldn't easily find out the exact date.

I also made the LegalNoticesDialog resizable, because it's silly trying to
read the legal notices in a teeny tiny window.
2016-02-05 16:01:25 +00:00
Usha Mandya
dd0f639784 CP-15481: Updated Migrate VMs, NFS, and SMB topics 2016-02-05 15:59:17 +00:00
Mihaela Stoica
265f52d823 Merge pull request #812 from GaborApatiNagy/master_CA-153143
CA-153143: [SCTX-1925] Workflow bug in adding a VIF
2016-02-05 11:57:48 +00:00
Gabor Apati-Nagy
ce80c8a9a7 Merge pull request #811 from MihaelaStoica/CP-15399
CP-15399: Move check for updates url to Branding.cs
2016-02-04 17:04:44 +00:00
Mihaela Stoica
86ec959e26 CP-15399: Improvements to the way we handle rebranding of saved searches
- InvisibleMessages.resx contains the default value for the saved search (xensearch), which can be overwritten in Branding.cs

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 12:04:33 +00:00
Mihaela Stoica
8e1493209d CP-15399: Improvements to the way we handle rebranding of update file
- InvisibleMessages.resx contains the default value for the update file extension (xsupdate), which can be overwritten in Branding.cs

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 10:55:18 +00:00
Mihaela Stoica
20970ff122 CP-15399: Move check for updates url to Branding.cs
- InvisibleMessages.resx contains the default url for check for updates, which can be overwritten in Branding.cs
- Added an extra parameter to DownloadUpdatesXmlAction for the updates url. If this is not specified (or null), then the default one (from InvisibleMessages) is used

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 10:39:14 +00:00
Mihaela Stoica
093feba229 CP-15825: Fix error where the About dialog pops up when a connection status changes
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-04 09:54:42 +00:00
Gabor Apati-Nagy
77bbb67bf8 CA-153143: [SCTX-1925] Workflow bug in adding a VIF
Fixed bug: "Depending on your workflow you can add a VIF to a VM with a duplicate MAC address without warning."

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-02-03 16:40:41 +00:00
Cheng Zhang
88a725d746 CP-15404: Remove unused resxs in XenAdmin
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-03 17:16:33 +08:00
Usha Mandya
baa03c7586 CP-15337: Draft Help for FCoE and Storage topics 2016-02-02 14:43:55 +00:00
Mihaela Stoica
a34cffbd64 Merge pull request #806 from cheng--zhang/CP-15404
CP-15404: Make help file rebrandable
2016-02-02 11:00:20 +00:00
Mihaela Stoica
b555781f8d Merge pull request #805 from cheng--zhang/CP-15162
CP-15162: Make installer rebrandable
2016-02-02 10:58:29 +00:00
Mihaela Stoica
8d0d3c0c8e Merge pull request #801 from GaborApatiNagy/CP-15711
CP-15711: Modify Select Update Page
2016-02-02 10:46:08 +00:00
Cheng Zhang
c209bae16e CP-15404: Make help file rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 13:19:14 +08:00
Cheng Zhang
7e88a4a16a CP-15951: Remove enbeded bmps in WLB credential dialog
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 09:45:29 +08:00
Rob Hoes
4d7693a503 CA-196231: Don't confuse start-on with migration
The "Start on Server" VM context menu incorrectly enabled hosts that a VM can
only be started on after a storage migration.  This was due to the fact that
the VMOperationToolStripMenuItem class is used for both "Start on Server" as
well as "Migrate to Server".

This change ensures that start checks are done when a start is requested, and
migration checks otherwise.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-02-01 17:34:24 +00:00
Mihaela Stoica
49e07882a6 CP-15825: Set Roaming=true for the new setting
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-01 11:21:17 +00:00
Gabor Apati-Nagy
f0e6d53103 CP-15711: Modify Select Update Page
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-29 18:06:31 +00:00
Gabor Apati-Nagy
b04c4d10dd CP-15711: Modify Select Update Page
Added Automatic option, but the option itself is disabled for now.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-29 18:01:53 +00:00
Mihaela Stoica
fb64d19853 CP-15825: Show About dialog at startup detailing company names that the connected hosts have been licensed to
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-29 14:38:58 +00:00
Mihaela Stoica
2689f0bd9e Merge pull request #797 from cheng--zhang/CA-192539
CA-192539: Adding iNode host to XenCenter should be restricted
2016-01-29 10:40:10 +00:00
Mihaela Stoica
25c787e61e CP-14817: Skip the product brand check in automated test mode
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-29 18:07:16 +08:00
Mihaela Stoica
2747ab702b CP-14817: Fixed "Unreachable code" warning
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:

	XenAdmin/MainWindow.cs
2016-01-29 14:28:47 +08:00
Mihaela Stoica
30aa9affc7 CP-14817: Add a check to refuse connection to a server that have different product brand
Change PRODUCT_BRAND to BRANDING_PRODUCT_BRAND

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

Conflicts:

	XenAdmin/Branding.cs
	XenAdmin/MainWindow.cs
	mk/xenadmin-build.sh
2016-01-29 14:26:53 +08:00
Mihaela Stoica
fc5ebd2d40 CP-15401: Move HiddenFeatures to a new class
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 21:43:15 +00:00
Mihaela Stoica
a9d7d95f56 CA-196887: New function for reading registry key written by the installer
- When the installer writes HiddenFeatures registry entry, it specifies registry key HKMU, that means that it will be written in HKLM if the user selected "All Users" for installation, or to HKCU if the user selected "Just Me".
- Added a new function to read an installed key by trying CurrentUser first, then Local Machine.
This function specifies a registry view (RegistryView.Registry32) when it opens the key (On the 64-bit version of Windows, portions of the registry are stored separately for 32-bit and 64-bit applications. There is a 32-bit view for 32-bit applications and a 64-bit view for 64-bit applications).

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
2016-01-28 14:57:16 +00:00
Cheng Zhang
8e64199497 CP-15267: Remove some help ID in helpmanager
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-28 18:13:39 +08:00
Cheng Zhang
4ba9981d28 Revert "CA-179515: Move to online help"
This reverts commit 0d0cf47523.

Conflicts:

	XenAdmin/Help/HelpManager.resx
	XenModel/InvisibleMessages.Designer.cs
	XenModel/InvisibleMessages.resx
2016-01-28 17:35:51 +08:00
Cheng Zhang
29ea52f6de Revert "CA-179515: Move to online help: remove .chm files"
This reverts commit 81761c33b0.
2016-01-28 17:09:18 +08:00
Mihaela Stoica
5461838925 Merge branch 'master' into CP-15410
Conflicts:
	XenAdmin/Core/Registry.cs
2016-01-27 14:06:13 +00:00
Mihaela Stoica
2c41a4cfeb CP-15410: Show license expiry alerts
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 16:30:24 +00:00
Mihaela Stoica
f12b4765b6 CP-15409: Add read-only mode to License manager
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-26 14:49:02 +00:00
Gabor Apati-Nagy
249489220b Merge pull request #786 from MihaelaStoica/CP-15407
CP-15407: Add license editions
2016-01-26 11:32:54 +00:00
Gabor Apati-Nagy
fd314b2440 Merge pull request #787 from koushikcgit/master
Removing possible null object reference
2016-01-26 11:32:27 +00:00
Mihaela Stoica
a53b23fe03 Merge pull request #788 from cheng--zhang/CP-15623
CP-15623: Remove Messages FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PL…
2016-01-26 09:32:25 +00:00
Mihaela Stoica
3416707fd2 Merge pull request #785 from cheng--zhang/CP-15401
CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depend…
2016-01-26 09:31:24 +00:00
Cheng Zhang
5be8c8978b CP-15623: Remove Messages FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PLATINUM_PLURAL
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 13:40:15 +08:00
Cheng Zhang
5c399ab4ba CP-15401: Avoid have null in URL constructor
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 11:16:39 +08:00
Koushik Chakravarty
c2e6c79670 Removing possible null object reference
Signed-off-by: Koushik Chakravarty <Koushik.Chakravarty@citrix.com>
2016-01-25 16:43:33 +05:30
Cheng Zhang
6b2490dea7 CP-15401: Hide upload option by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 16:23:31 +08:00
Cheng Zhang
b33e579f28 CP-15401: Hide HealthCheck by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 13:40:45 +08:00
Cheng Zhang
04d3b81d92 CP-15401: Changed WarningWithInformationUrl and ProblemWithInformationUrl to cope with empty URL string
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-25 11:15:30 +08:00
Mihaela Stoica
26d9e0a3f9 CP-15401: Rearrange the legal notice dialog
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-22 14:02:14 +00:00
Mihaela Stoica
3ccfcc7e3a Merge pull request #782 from cheng--zhang/CP-15398
CP-15398: Make version, xsupdate and xensearch rebrandable
2016-01-22 13:16:03 +00:00
Cheng Zhang
d4ec1289c2 CP-15401: Move hidden check out of designer
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 17:02:59 +08:00
Cheng Zhang
7793f8547e CP-15401: Make legal notice change by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 16:51:37 +08:00
Cheng Zhang
e488c62175 CP-15401: Make Cross-server private network hide by reg key
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 14:30:28 +08:00
Cheng Zhang
3157f8dd30 CP-15404: Rebranding the installer and fix translation issue
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:20 +08:00
Cheng Zhang
1485a056e9 CP-15399: Make xsupdate rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:12 +08:00
Cheng Zhang
88d881b126 CP-15401: Show/Hide rdpPolling, upsell and optimize for XenApp depending on XenCenter registry keys
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:31:22 +08:00
Mihaela Stoica
6feab75fb4 CP-15407: Add license editions
Cherry-picked from cream-indigo:
CP-14857: Add "premium" license edition
CP-14857: Add premium license edition for CN version
CA-190342: Add friendly name for "basic" edition
- also hide the Status field from the License Details section if the license is basic

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-21 12:31:33 +00:00
Gabor Apati-Nagy
e5545b3011 Merge pull request #781 from MihaelaStoica/CP-15408
CP-15408: Add license restrictions
2016-01-20 14:04:08 +00:00
Mihaela Stoica
c423fff1dc CP-15408: Renamed RestrictInterPoolMigrate function
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-20 13:48:36 +00:00
Mihaela Stoica
9aee7a4f9b Merge pull request #773 from GaborApatiNagy/CA-187681
CA-187681: xs-tools ISO doesn't get mounted on dlvm xva(Centos 7 HVM)
2016-01-20 12:27:29 +00:00
Mihaela Stoica
e3f5490a03 Merge pull request #783 from robhoes/master
CA-186237: Add links to citrix.com
2016-01-20 12:26:48 +00:00
Gabor Apati-Nagy
50b297e743 Merge pull request #778 from MihaelaStoica/CP-15390
CP-15390: Bring back "restrict_pooling"
2016-01-20 12:20:34 +00:00
Gabor Apati-Nagy
04e5820db2 Merge pull request #776 from MihaelaStoica/CP-14472
CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
2016-01-20 12:19:07 +00:00
Rob Hoes
a887faa5f1 –CA-186237: Add link to citrix.com to SSR wizard
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-20 12:03:18 +00:00
Rob Hoes
7e31b484ed CA-186237: Add link to citrix.com to HealthCheck settings dialog
Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
2016-01-20 12:03:12 +00:00
Cheng Zhang
992ee9e62f CP-15400: Make xensearch rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:54 +08:00
Cheng Zhang
91f7f0646f CP-15398: Make version rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:07 +08:00
Cheng Zhang
75ebed8831 CP-15398: Add missed @
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:50 +08:00
Cheng Zhang
dc0b468cbc CP-15398: Change the messages in legal notices
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:49 +08:00
Cheng Zhang
98f638027f CP-15398: Rework on comments
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:42:49 +08:00
Cheng Zhang
31b7337026 CP-15398: Remove enbedded icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:56 +08:00
Cheng Zhang
15ef3410a3 CP-15398: Make file name and dir rebrandablei
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:55 +08:00
Cheng Zhang
07c9301637 CP-15398: Change the about dialog texture
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
08741a1fa0 CP-15398: Make texture company name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
d71a20706b CP-15398: Make textue with control key rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:53 +08:00
Cheng Zhang
4f0270d049 CP-15398: Make texture XenServer Host rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:52 +08:00
Cheng Zhang
010ff919c1 CP-15398: Make texture XenServer product rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:36:21 +08:00
Mihaela Stoica
89694b98e3 Merge pull request #775 from GaborApatiNagy/CA-159790_2
CA-159790: [XSO-208] & CA-103752
2016-01-18 21:58:21 +00:00
Cheng Zhang
a57a610b08 CP-15408: Add license restriction for VSS snapshots
- The license restriction for vss snapshots already exists in trunk. This commit just amends the message displayed when the feature is not available.

Cherry picked from cream-indigo:
CA-190395: Replace the usage of FEATURE_NOT_AVAILABLE_NEED_ENTERPRISE_OR_PLATINUM_PLURAL
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:48:32 +00:00
Cheng Zhang
4a1a9914d6 CP-15408: Add license restriction for VM migration
Cherry picked from cream-indigo:
CP-14848: License restriction for migration for DragDropMigrateVMCommand
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:48:06 +00:00
Cheng Zhang
ea690581d0 CP-15408: Add license restriction for VM migration
Cherry picked from cream-indigo:
CP-14848: XenCenter: Implement license restriction for migration
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-18 15:44:50 +00:00
Mihaela Stoica
0d08b143d1 CP-15390: Bring back "restrict_pooling"
(partially revert commit 8ea7e73b55)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-15 14:42:36 +00:00
Gabor Apati-Nagy
5e48d730c1 CA-159790: [XSO-208] MeddlingActions don't show location information
Set the Host to the pool master if the task.resident_on host doesn't resolve

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-15 13:43:09 +00:00
Mihaela Stoica
11362f22d2 CP-14472: Remove the lock in the License Manager and ensure that all the updates are done on the main thread.
- changed the licenseStatus_ItemUpdated event handler to invoke on the main thread, as this is the only case when a background thread needs to update the storedRows list..All the other reads and writes are taken place on the main (UI) thread
- removed the storedRowsLock as it is not needed since we do all the updates to storedRows on one thread.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-14 16:22:13 +00:00
Gabor Apati-Nagy
3f9db9f98b CA-159790: [XSO-208] MeddlingActions don't show location information
Found a better solution

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2016-01-14 14:33:06 +00:00
Cheng Zhang
a33d10bade CP-15398: Make texture XenCenter rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 18:52:53 +08:00
Cheng Zhang
9dcbd0a430 CP-15403: Remove year information in copyright
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:46 +08:00