Patch subject is complete summary.
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 Mike McClurg <[email protected]> # Date 1301425711 -3600 # Node ID aa7ca45e860cc397f62d8d8f6efb981e38f5d099 # Parent fd8bb71bb15707c60c76c20da852f9d0b2bffb33 imported patch ca54270-vdi_sparse_import_capability diff --git a/ocaml/license/edition.ml b/ocaml/license/edition.ml --- a/ocaml/license/edition.ml +++ b/ocaml/license/edition.ml @@ -49,7 +49,7 @@ (* Editions to features *) -let free_features = [VLAN; QoS; Shared_storage; Pooling; Marathon; Connection; IntelliCache] +let free_features = [VLAN; QoS; Shared_storage; Pooling; Marathon; Connection; IntelliCache; VDI_sparse_import] let advanced_features = HA :: Email :: Performance :: DMC :: Vswitch_controller :: CPU_masking :: No_nag_dialog :: No_platform_filter :: free_features let enterprise_features = Netapp :: Equalogic :: WLB :: RBAC :: Checkpoint :: StorageLink :: advanced_features let platinum_features = VMPR :: Lab :: Stage :: StorageLink_site_recovery :: enterprise_features diff --git a/ocaml/license/features.ml b/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 | VMPR - | IntelliCache + | IntelliCache | VDI_sparse_import | Lab | Stage | StorageLink | StorageLink_site_recovery type orientation = Positive | Negative @@ -48,6 +48,7 @@ No_nag_dialog, ("regular_nag_dialog", Negative, "nonag"); VMPR, ("restrict_vmpr", Negative, "VMPR"); IntelliCache, ("restrict_intellicache", Negative, "IntelliCache"); + VDI_sparse_import, ("restrict_sparse_upload", Negative, "vdi_sparse_import"); Lab, ("restrict_lab", Negative, "lab"); Stage, ("restrict_stage", Negative, "stage"); StorageLink, ("restrict_storagelink", Negative, "SL"); diff --git a/ocaml/license/features.mli b/ocaml/license/features.mli --- a/ocaml/license/features.mli +++ b/ocaml/license/features.mli @@ -38,6 +38,7 @@ | No_nag_dialog (** Used by XenCenter *) | VMPR (** Enable use of VM Protection and Recovery *) | IntelliCache (** Enable use of IntelliCache feature *) +| VDI_sparse_import (** Enable use of "sparse encoding" for import_raw_vdi *) | Lab (** Enable use of Lab Manager *) | Stage (** Enable use of Stage Manager *) | StorageLink (** Enable use of StorageLink *)
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
