Commit Graph

3932 Commits

Author SHA1 Message Date
Sorin Sbarnea
c47f5e5a74 Changed .gitattributes so it will keep newlines the same regardless of the platform. 2013-07-02 13:35:09 +01:00
Sorin Sbarnea
dc84e81662 corrected checkout of xenadmin.hg when it does not exists. 2013-07-02 13:30:31 +01:00
Sorin Sbarnea
71882d15b2 Configured *.sh to use LF line endings. 2013-07-02 13:02:43 +01:00
Adrian Jachacy
c96da7ba38 CA-110446: XenCenter Installation: multiple install on same OS when
selected installation for all users.

Changed XeCenter.wxs file (and updated XenCenter.l10n.diff accordingly) to
set ALLUSERS property when InstallDir key found in HKLM registry, i.e.
previous version of XenCenter was installed for "All users" (the
property is not set when previous version was installed for "Just me"). The
property is cleared after searching for related products is finished to
allow the user changing installation context in GUI.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-02 12:36:41 +01:00
Mihaela Stoica
39a9991118 Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin 2013-07-01 17:08:55 +01:00
Mihaela Stoica
b6a8845bd0 CA-110447 Updating the pool-join rules so that we do not allow a licensed host to join an unlicensed pool
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-01 16:48:22 +01:00
Mihaela Stoica
a7186ee4e6 CA-109243: Offer to license a host when joining a pool that is licensed
with a per-socket licence (minor code refactoring).

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-01 16:04:19 +01:00
Mihaela Stoica
978c9679c3 CA-107923: Display the correct pool license edition in License Manager and
in the General Tab.

When master and slave(s) are licensed with different editions, the pool
license edition is not the master's edition, but the lowest license in the
pool.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-01 14:03:35 +01:00
Adrian Jachacy
2ff85de32f CA-106455: XenCenter Installation: multiple install on same OS when selected installation for all users; Asking for .NET 3.5 while repair or uninstall.
1. Added missing copyright header to XenCenter.l10n.diff file.
2. Added -ext WiXNetFxExtension to CANDLE command in xenadmin-build.sh
file.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-01 13:45:25 +01:00
Adrian Jachacy
750bf609d5 CA-106455: XenCenter Installation: multiple install on same OS when selected installation for all users; Asking for .NET 3.5 while repair or uninstall.
Changed the way we check whether .NET 2.0/.NET 3.5 framework is already
installed on the user machine or not.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-07-01 11:02:01 +01:00
Mihaela Stoica
462ada64eb CA-109243: Offer to license a host when joining a pool that is licensed
with a per-socket licence.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-07-01 10:37:25 +01:00
Mihaela Stoica
15c02aa2c9 CA-90855: Allow Rolling Pool Upgrade wizard to be resumed when master has
been previously upgraded.

Introduced Host.LongProductVersion property which returns host's
product version and build number (e.g. 5.6.100.72258), or null if
product version can't be found. We use this property to check
if the master has been updraded and to decide which slaves need
to be upgraded or to skip hosts already upgraded.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-28 15:50:14 +01:00
Mihaela Stoica
48fedf006f Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin 2013-06-28 10:30:53 +01:00
Adrian Jachacy
2a29743ecb CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.
1. Modified RunCheck method in AssertCanBeRecoveredCheck.cs to always take
into account SR passed in ErrorDescription.
2. Format Description in MissingMultipleFCSRsProblem.cs.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-06-28 10:24:12 +01:00
Adrian Jachacy
6e2b3fc40f CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.
Clear All button disabled when no rows selected; Select All button
disabled when all rows selected.

Signed-off-by: Adrian Jachacy <Adrian.Jachacy@citrix.com>
2013-06-28 09:04:39 +01:00
Mihaela Stoica
4d638c4f65 CA-109483: Show correct licence status in the Licence manager for licensed XenServer hosts version 6.1.0 and earlier
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-27 14:40:11 +01:00
Adrian Jachacy
58e187d981 Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/xenadmin 2013-06-25 17:12:26 +01:00
Mihaela Stoica
d644c227da CP_4818: Removed id_dsa and its use in the build script
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-25 17:06:01 +01:00
Adrian Jachacy
9358362bd0 CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.
Fixed issue reported in review #1846.
2013-06-25 17:01:21 +01:00
Mihaela Stoica
a37e294f12 CP-4816: Configuring git to ignore ReSharper files; also removed some unused rules (.gitignore file)
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-25 13:01:17 +01:00
Adrian Jachacy
5e39b8afc7 CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.
1. Resized columns on the LOcate Mirrored SRs page in the DR Wizard.
2. Changed wording of DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILBACK and
   DR_WIZARD_STORAGEPAGE_DESCRIPTION_FAILOVER messages.
2013-06-25 12:42:17 +01:00
Adrian Jachacy
085629c3de CP-4946: PR-1634: Bulk import of FibreChannel LUNs in DR Wizard.
Added possibility to select/clear all rows on the Locate Mirrored SRs
page in the DR wizard.
2013-06-25 11:48:20 +01:00
Mihaela Stoica
7035ac7d4a CP-4807: Updated ChangeLog with version number; updated Readme file
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-25 09:45:11 +01:00
Mihaela Stoica
3994259c08 CP-4816: Temporarly changed the build script to skip the update of the assembly file version
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 18:44:37 +01:00
Mihaela Stoica
2ad1e96078 CP-4816: Changed build scripts to work with git
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 18:16:39 +01:00
Mihaela Stoica
aa5fe93ff5 CP-4818: Change permissions to id_dsa file in script
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 17:44:25 +01:00
Mihaela Stoica
955454e675 CP_4818: Changed permissions to id_dsa file
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 17:29:09 +01:00
Mihaela Stoica
9b46617bff CP-4816: More changes to the bumpBuildNumber script to try and make it work with git
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 16:14:50 +01:00
Mihaela Stoica
444c0a4b1a CP-4816: Changes to the bumpBuildNumber script to try and make it work with git
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 15:09:00 +01:00
Mihaela Stoica
7ce79d692b CP-4816: Updated bumpBuildNumber script to work with git
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 13:15:19 +01:00
Mihaela Stoica
6f35871fb0 CP-4816: updated build scripts to use git repo
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 13:03:07 +01:00
Mihaela Stoica
bd36a85bff CP-4816: Initial commit to git repo
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2013-06-24 12:41:48 +01:00