From e555bb332dec342beea7291a4b9710ca24b25dbe Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Sun, 02 Sep 2007 20:19:52 +0000
Subject: [PATCH] Update the configuration definitions for several virtual attribute implementations to provide default values for the conflict-behavior property.

---
 opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
index 17b9e5c..50d4b32 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/HasSubordinatesVirtualAttributeConfiguration.xml
@@ -57,5 +57,15 @@
     </adm:default-behavior>
   </adm:property-override>
 
+  <adm:property-override name="conflict-behavior">
+    <adm:default-behavior>
+      <adm:defined>
+        <adm:value>
+          virtual-overrides-real
+        </adm:value>
+      </adm:defined>
+    </adm:default-behavior>
+  </adm:property-override>
+
 </adm:managed-object>
 

--
Gitblit v1.10.0