> From: Dave Scott
> This one failed to apply for me -- could you resend a new one, rebased
> to tip?
Oops, the new rebased patch (attached) should apply.
Cheers,
Marcus
----
ocaml/license/features.ml | 3 ++-
ocaml/license/features.mli | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
# HG changeset patch
# User Marcus Granado <marcus.granado@xxxxxxxxxx>
# Date 1282575250 -3600
# Node ID dae9c5c59f2678ecbb81518438c30354f978bbeb
# Parent 2580868fdc435e5c729f98bd707d018dafd3dc2a
CP-1798: license updates for VMPR (PR-1031)
Signed-off-by: Marcus Granado <marcus.granado@xxxxxxxxxxxxx>
diff -r 2580868fdc43 -r dae9c5c59f26 ocaml/license/features.ml
--- a/ocaml/license/features.ml
+++ b/ocaml/license/features.ml
@@ -19,7 +19,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
+ | Vswitch_controller | CPU_masking | Connection | No_platform_filter |
No_nag_dialog | VMPR
type orientation = Positive | Negative
@@ -44,6 +44,7 @@
Connection, ("restrict_connection", Negative, "Cnx");
No_platform_filter, ("platform_filter", Negative, "Plat");
No_nag_dialog, ("regular_nag_dialog", Negative, "nonag");
+ VMPR, ("restrict_vmpr", Negative, "VMPR");
]
let string_of_feature f =
diff -r 2580868fdc43 -r dae9c5c59f26 ocaml/license/features.mli
--- a/ocaml/license/features.mli
+++ b/ocaml/license/features.mli
@@ -36,6 +36,7 @@
| Connection (** Used by XenCenter *)
| No_platform_filter (** Filter platform data *)
| No_nag_dialog (** Used by XenCenter *)
+| VMPR (** Enable use of VM Protection and
Recovery *)
(** The list of all known features. *)
val all_features : feature list
xen-api.hg-07.patch
Description: xen-api.hg-07.patch
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home