CLEARWATER: Second wave of commits for PR-1589 #1131

Merged
merged 4 commits into from Apr 3, 2013

Conversation

Projects
None yet
1 participant
@johnelse
Collaborator

johnelse commented Apr 3, 2013

No description provided.

johnelse added some commits Mar 21, 2013

CP-4322: Remove license check from VM lifecycle operations
Signed-off-by: John Else <john.else@citrix.com>
CP-4318: Handle v6d not running when creating software_version
Signed-off-by: John Else <john.else@citrix.com>
CP-4318: Fall back to free edition if v6d is not running at startup
Signed-off-by: John Else <john.else@citrix.com>
CP-4319: Detect socket count in v6client.ml
Sending the socket count in the params list to V6client.apply_edition is
a bad idea, since this function also sends the current
Host.license_params, which may also contain the socket count, to v6d.

Instead, we update the license_params map with the socket count before
sending it to v6d.

This also means that the correct socket count is sent to v6d at xapi
startup.

Signed-off-by: John Else <john.else@citrix.com>
@johnelse

This comment has been minimized.

Show comment Hide comment
@johnelse

johnelse Apr 3, 2013

Collaborator

Equivalent (not quite a duplicate) of #1125 for Clearwater.

Collaborator

johnelse commented Apr 3, 2013

Equivalent (not quite a duplicate) of #1125 for Clearwater.

johnelse added a commit that referenced this pull request Apr 3, 2013

Merge pull request #1131 from johnelse/sku-flattening-xapi-II-clearwater
CLEARWATER: Second wave of commits for PR-1589

@johnelse johnelse merged commit 389d2e2 into xapi-project:clearwater Apr 3, 2013

1 check passed

default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment