Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,357 Commits 11 Branches 48 Tags 186 MiB
3955704ec0
Commit Graph

3357 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabor Apati-Nagy
3955704ec0 Merge pull request #1236 from mcintyre94/CA-226012 
[CA-211267] Add a lightweight polling mechanism to the appliance tasks, to provide an accurate timer
 2016-10-24 17:39:53 +01:00
Callum McIntyre
d39a1a7cd3 [CA-211267] Change MAX_ITERATIONS to use SLEEP_TIME, making it a bit clearer and ensuring it's always approx 24h 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-24 17:33:31 +01:00
Callum McIntyre
f11ed643b6 Add a timeout of approximately 24 hours to the TickUntilCompletion method. 2016-10-24 16:13:44 +01:00
Callum McIntyre
bb78309279 [CA-211267] Remove the passing this around and null action check, change TickUntilCompletion to be non-static 2016-10-24 14:22:35 +01:00
Callum McIntyre
7d7a040335 [CA-211267] Add a null check, use Run() to stop child classes directly calling InitialiseTicker() 
TickUntilCompletion() is now a static method and again takes an ApplianceAction parameter. It does a null check on each while iteration to handle the case where another thread nulls the action. Also added Run() method to ApplianceAction which initialises the ticker (now a private method), and let child classes call Run() instead.
 2016-10-24 11:59:28 +01:00
Konstantina Chremmou
56d7f52b16 Merge pull request #1235 from MihaelaStoica/master 
CP-19257: Icon for Kylin Linux
 2016-10-24 10:46:10 +01:00
Callum McIntyre
15b4705942 [CA-211267] Move the sleep time into a const int of the class. Also removed the ApplianceAction parameter from TickUntilCompletion (it behaved like a static method), to make it more similar to TaskPoller.PollToCompletion 2016-10-24 10:06:59 +01:00
Callum McIntyre
de43761039 [CA-211267] Add a lightweight polling mechanism to the appliance tasks, to provide an accurate timer 
For other actions we get a ticking timer in the Events view because they use PollToCompletion, which calls their Changed event every 900ms. These actions don't use PollToCompletion, and didn't regularly call their Changed event - so their timer didn't tick regularly. This change adds a lightweight mechanism to call their changed event every 900ms until they complete. This allows the events page timer to tick every second in the same way as it does for other actions.
 2016-10-24 09:56:09 +01:00
Konstantina Chremmou
1744ca0415 Merge pull request #1237 from MihaelaStoica/CA-226256 
CA-226256: Trying to change boot order toggles boot flags
 2016-10-24 08:47:09 +01:00
Mihaela Stoica
93149f75f8 CA-226256: Trying to change boot order toggles boot flags 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-21 18:53:17 +01:00
Mihaela Stoica
6eb2c80895 CP-19257: Icon for Kylin Linux 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-21 18:46:38 +01:00
Mihaela Stoica
4b67140b1d Merge pull request #1224 from kc284/master 
Some enhancements on the New Graph Dialog:
 2016-10-21 13:16:20 +01:00
Konstantina Chremmou
ac01c0e120 Fixed size changes done by the VS designer. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-10-21 13:11:46 +01:00
Mihaela Stoica
2c550c8b60 Merge pull request #1225 from mcintyre94/CA-226012 
[CA-226012] Use branding version in the SERVER_TOO_OLD message
 2016-10-21 12:37:18 +01:00
Mihaela Stoica
1992e2bc58 Merge pull request #1231 from sriharshak/master 
L10N:Bug fixes for "CA-226245" and "CA-226244"
 2016-10-21 12:18:01 +01:00
Callum McIntyre
5cb4cc8ba1 Add the branding for 6.0 to branding.sh and re-branding.sh 2016-10-21 10:58:32 +01:00
sri harsha tagore k
4d65c1cf1e L10N:Bug fixes for "CA-226245" and "CA-226244" 2016-10-21 15:17:21 +05:30
Konstantina Chremmou
5dc6749474 Merge pull request #1227 from MihaelaStoica/master 
CA-226112: Disable PVS read caching causes System.NullReferenceException
 2016-10-21 10:39:41 +01:00
Mihaela Stoica
6bffb803a1 CA-226112: Disable PVS read caching causes System.NullReferenceException 
- code simplification

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-21 07:10:23 +01:00
Mihaela Stoica
994ced8388 CA-226112: Disable PVS read caching causes System.NullReferenceException 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-20 14:52:51 +01:00
Callum McIntyre
d7fde3866e [CA-226012] Use branding version in the SERVER_TOO_OLD message 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-20 10:43:39 +01:00
Mihaela Stoica
1040027a6d Merge pull request #1223 from mcintyre94/master_dotnetupgrade 
[DotNet Upgrade] Revert the temporary change to use the local .net installer, get .net 4.6 from dotnetpackages again
 2016-10-20 10:09:48 +01:00
Konstantina Chremmou
e6ec0d430b Some enhancements on the New Graph Dialog: 
- on certain occasions retrieving datasources can be slow; show a spinner while in progress.
- on certain systems the list of datasources may be long; added search box to aid the user filter them by name.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-10-20 00:03:47 +01:00
Mihaela Stoica
49ba853958 Merge pull request #1218 from mcintyre94/CA-225062 
[CA-225062] For Ely and greater hosts, don't check for IO tools when activating/deactivating (this covers detatch + delete too in UI) a VBD
 2016-10-19 13:19:22 +01:00
Mihaela Stoica
2c0d830754 Merge pull request #1221 from sriharshak/master 
L10N:TRanslations check-ins
 2016-10-19 13:17:47 +01:00
sri harsha tagore k
1e8791fb38 L10N:TRanslations check-ins 2016-10-19 16:37:43 +05:30
Callum McIntyre
239c2e8b9d [DotNet Upgrade] Revert the temporary change to use the local .net installer, get .net 4.6 from dotnetpackages again 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-19 09:38:18 +01:00
Mihaela Stoica
9de2dae4a1 Merge pull request #1219 from sriharshak/master 
L10N:TRanslations check-ins
 2016-10-18 17:57:42 +01:00
sri harsha tagore k
529cddb035 L10N:TRanslations check-ins 2016-10-18 22:16:57 +05:30
mcintyre94
284afe255e Merge pull request #1210 from kc284/CA-150412 
CA-150412: OtherConfigAndTagsWatcher deliberately throws exceptions
 2016-10-18 17:11:28 +01:00
Mihaela Stoica
045db14381 Merge pull request #1191 from mcintyre94/master_dotnetupgrade 
[Dotnet upgrade] Upgrade XenCenter to .net 4.6
 2016-10-18 16:57:18 +01:00
Mihaela Stoica
b7d963cfa2 Merge pull request #1217 from sriharshak/master 
L10N:TRanslations check-ins
 2016-10-18 16:52:41 +01:00
Callum McIntyre
2ad99b06d4 [CA-225062] For Ely and greater hosts, don't check for IO tools when activating/deactivating (this covers detatch + delete too in UI) a VBD 
Instead we use the vbd.allowed_operations list, and check for the plug/unplug operation respectively.

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-18 16:48:05 +01:00
sri harsha tagore k
63387232b9 L10N:TRanslations check-ins 2016-10-18 20:45:24 +05:30
Gabor Apati-Nagy
06de296c62 Merge pull request #1216 from MihaelaStoica/master 
Merge branch 'CAR-2184' to master
 2016-10-18 11:29:33 +01:00
Mihaela Stoica
329f084a7e Merge branch 'CAR-2184' to master 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

Conflicts:
	XenModel/XenAPI-Extensions/SR.cs
 2016-10-18 10:18:47 +01:00
Callum McIntyre
fd14e4205c [DotNet Upgrade] Use REPO_CITRITE_HOST in WEB_HOTFIXES_ROOT 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-18 10:14:51 +01:00
Konstantina Chremmou
5bb7e3bac5 CA-157786: Updated tests. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-10-18 08:53:23 +01:00
Mihaela Stoica
7ec3881e05 Merge pull request #1212 from kc284/CA-157786 
CA-157786: General tab for VDIs.
 2016-10-18 08:01:57 +01:00
Konstantina Chremmou
c7ea650cf6 CA-157786: Use NameWithLocation to display the name of the VDI's SR. Also, removed 
unconventionally named method which did not offer much to code legibility.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-10-17 23:26:13 +01:00
Konstantina Chremmou
38bf5b86d3 Merge pull request #1208 from MihaelaStoica/CA-224567 
CA-224567: PVS Site renaming plus some other improvements
 2016-10-17 22:06:48 +01:00
Mihaela Stoica
15344401c0 CA-224567: Correction in the text on the PVS Cache configuration page 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-17 16:00:28 +01:00
mcintyre94
e8152cef5d Merge pull request #1214 from MihaelaStoica/CA-225708 
CA-225708: Can not increase dom0 Memory multiple times
 2016-10-17 15:20:57 +01:00
Mihaela Stoica
18243b229f CA-225708: Can not increase dom0 Memory multiple times 
- take the already assigned dom0 memory into account when calculating maximum memory available

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-10-17 14:23:50 +01:00
Callum McIntyre
8d9007205f (TEMPORARY) Swap .net installer for a local copy of the 4.6 one, for 
testing

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:09 +01:00
Callum McIntyre
dfe627b5ee [DotNet upgrade] Use executables from WIX_BIN instead of the default Wix candle/lit/light exes (which may not be the WIX_BIN ones), to guarantee using the patched+built 3.10 exes 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:08 +01:00
Callum McIntyre
574c7ed221 [DotNet upgrade] Update wix patches for 3.10, to address changes in the source files 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:07 +01:00
Callum McIntyre
4b5e4ce11a [DotNet upgrade] Use Wix 3.10 binaries so that we can support .net 4.6 checks 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:12:41 +01:00
Callum McIntyre
10d932fc76 [DotNet upgrade] Replace NETFRAMEWORK checks with WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED in Wix checks, which is the correct way to check for a 4.6+ install 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:09:47 +01:00
Callum McIntyre
168dbe4c13 [DotNet upgrade] Upgrade the XenCenter installer to use .net 4.6 
In the dotnet installers we now compare the Release Dword against the lowest 4.6 version, accepting anything >=. Build number from https://msdn.microsoft.com/en-us/library/hh925568(v=vs.110).aspx

Also updated the wix check and xe project, as was done in the similar .net 4.5 upgrade

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:09:08 +01:00