Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch xs64bit #77

Merged
merged 27 commits into from May 27, 2014

Conversation

@GaborApatiNagy
Copy link
Contributor

commented May 27, 2014

No description provided.

kc284 and others added 27 commits May 12, 2014
CA-118422: Added missing friendly name.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
CA-122558: Generate a license alert when the license status is expire…
…d. Fixed incorrect

timestamp for both license expiring and license expired alerts. Indentation.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Merge pull request #64 from kc284/xs64bit
CA-122558 and addition to CA-118422.
CA-115429: Fixed: Deletion of snapshot is successful but XenCenter lo…
…gs show error.

XAPI (from 1.7) destroy destroys suspend VDIs as well (code is here: xapi: ocaml/xapi/cli_operations.ml). Depending on actual race conditions, this can lead to a situation when we try to destroy a Suspend VDI that has just been deleted.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
CA-115429: Removed code, because it does not needed for supported XS …
…versions

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Merge pull request #65 from GaborApatiNagy/xs64bit
CA-115429: Fixed: Deletion of snapshot is successful but XenCenter logs ...
CA-135560: Fix Creedence version number check and make WLB tab behavi…
…our same for 6.5 and 6.1.

Signed-off-by: Zheng Chai <zheng.chai@citrix.com>
Merge pull request #66 from Zhengchai/CA-135560
CA-135560: Fix Creedence version number check and make WLB tab behaviour...
CA-135489: VM Performance tab: Make sure that the y-axis units and sc…
…ale match when setting the static memory to 1024MB

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Merge pull request #67 from MihaelaStoica/CA-135489
CA-135489: Make sure that the y-axis units and scale match
Stephen Turner
CA-132066 Make Heartbeat work as designed
The Heartbeat would log out the session after the first missed heartbeat.
This worked fine when the Heartbeat was on its own session, back in George
and earlier versions. However, when it was changed to use just a
DuplicateSession() instead of a new Session(), this broke the main session
of the connection. This caused a first heartbeat failure to break the
connection, and also caused the expectDisruption flag to be ignored.

This patch restores the old behaviour by not logging out the session until
the second failure.
Merge pull request #69 from stephen-turner/CA-132066
CA-132066 Make Heartbeat work as designed
Merge pull request #68 from GaborApatiNagy/xs64bit
CA-115429: New fix as per code review: Deletion of snapshot is successfu...
Stephen Turner
CA-135078 Rename "Delete Pool"
Renamed "Delete Pool" to "Make into standlone server"
Made sure it can never work with a multi-server pool
Removed confirmation dialog, as it is not destructive
Removed from context menu, as it is not important/common enough
CA-135563:WLB tab show error message after disable WLB using Read Onl…
…y user

Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
Merge pull request #72 from stephen-turner/CA-135078
Fix tests after fix for [CA-135078]
Merge pull request #71 from cheng--zhang/CA-135563
CA-135563:WLB tab show error message after disconnect WLB by Read-Only user
CP-7941: Update SDK within XenCenter 6.5.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
CA-121385 Allow creation of VLAN 0 in XenCenter. This applies to the …
…New Network Wizard and the Network Properties.

- The VLAN can be set to 0 only for Creedence or greater hosts on the vSwitch backend.
- When VLAN 0 is selected, an info is shown next to the control, saying "VLAN 0 will receive all traffic not on any other VLAN"
- Also fixed an error on New Network Wizard, where the "VLAN in use" message was still visible when changing the NIC.

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
CP-8474: Remove iSL radio button from XenCenter for >= Creedence serv…
…ers.

Made the radio button invisible for Creedence or higher XS hosts.
Removed previous StorageLink-related upgrade pre-checks and added (strict) check to prevent upgrade when StorageLink is used.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
CP-8474: Remove iSL radio button
Changes following the code review

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Merge pull request #74 from MihaelaStoica/CA-121365
CA-121385 Allow creation of VLAN 0 in XenCenter.
Merge pull request #76 from GaborApatiNagy/xs64bit
CP-8474: Remove iSL radio button from XenCenter for >= Creedence servers...
Merge pull request #73 from kc284/xs64bit
CP-7941: Update SDK within XenCenter 6.5.

@GaborApatiNagy GaborApatiNagy changed the title Xs64bit Merge branch xs64bit May 27, 2014

GaborApatiNagy added a commit that referenced this pull request May 27, 2014

@GaborApatiNagy GaborApatiNagy merged commit 0c613d3 into master May 27, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.