Hi Marcus,
This one failed to apply for me -- could you resend a new one, rebased to tip?
Thanks,
Dave
> -----Original Message-----
> From: xen-api-bounces@xxxxxxxxxxxxxxxxxxx [mailto:xen-api-
> bounces@xxxxxxxxxxxxxxxxxxx] On Behalf Of Marcus Granado
> Sent: 20 August 2010 16:52
> To: xen-api
> Subject: [Xen-API] [PATCH 07 of 21] CP-1798: license updates for VMPR
> (PR-1031)
>
> ocaml/license/edition.ml | 2 +-
> ocaml/license/features.ml | 3 ++-
> ocaml/license/features.mli | 1 +
> 3 files changed, 4 insertions(+), 2 deletions(-)
>
>
> # HG changeset patch
> # User Marcus Granado <marcus.granado@xxxxxxxxxx> # Date 1282322886 -
> 3600 # Node ID 77539f5be6a532f27a481ae8fa02f181e2bc532a
> # Parent 6c9700d2ab2c03f24f9f42c203e53583f28dcb89
> CP-1798: license updates for VMPR (PR-1031)
>
> Signed-off-by: Marcus Granado <marcus.granado@xxxxxxxxxxxxx>
>
> diff -r 6c9700d2ab2c -r 77539f5be6a5 ocaml/license/edition.ml
> --- a/ocaml/license/edition.ml
> +++ b/ocaml/license/edition.ml
> @@ -52,7 +52,7 @@
> let free_features = [VLAN; QoS; Shared_storage; Pooling; Marathon;
> Connection] let advanced_features = HA :: Email :: Performance ::
> DMC :: No_nag_dialog :: No_platform_filter :: free_features let
> enterprise_features = Netapp :: Equalogic :: WLB :: RBAC ::
> Checkpoint :: Vswitch_controller :: CPU_masking :: StorageLink ::
> advanced_features -let platinum_features = Lab :: Stage ::
> StorageLink_site_recovery :: enterprise_features
> +let platinum_features = VMPR :: Lab :: Stage ::
> +StorageLink_site_recovery :: enterprise_features
>
> let to_features = function
> | Free -> free_features
> diff -r 6c9700d2ab2c -r 77539f5be6a5 ocaml/license/features.ml
> --- a/ocaml/license/features.ml
> +++ b/ocaml/license/features.ml
> @@ -20,7 +20,7 @@
> type feature = VLAN | QoS | Shared_storage | Netapp | Equalogic |
> Pooling
> | HA | Marathon | Email | Performance | WLB | RBAC | DMC |
> Checkpoint
> | Vswitch_controller | CPU_masking | Connection |
> No_platform_filter | No_nag_dialog
> - | Lab | Stage | StorageLink | StorageLink_site_recovery
> + | Lab | Stage | StorageLink | StorageLink_site_recovery | VMPR
>
> type orientation = Positive | Negative
>
> @@ -49,6 +49,7 @@
> Stage, ("restrict_stage", Negative, "stage");
> StorageLink, ("restrict_storagelink", Negative, "SL");
> StorageLink_site_recovery,
> ("restrict_storagelink_site_recovery", Negative, "SLSR");
> + VMPR, ("restrict_vmpr", Negative, "VMPR");
> ]
>
> let string_of_feature f =
> diff -r 6c9700d2ab2c -r 77539f5be6a5 ocaml/license/features.mli
> --- a/ocaml/license/features.mli
> +++ b/ocaml/license/features.mli
> @@ -40,6 +40,7 @@
> | Stage (** Enable use of Stage Manager
> *)
> | StorageLink (** Enable use of StorageLink *)
> | StorageLink_site_recovery (** Enable use of StorageLink Site
> Recovery*)
> +| VMPR (** Enable use of VM Protection
> and
> Recovery *)
>
> (** The list of all known features. *)
> val all_features : feature list
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home