From 70d9021a11e28d52e9fce405a924435112ca3a04 Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Mon, 11 Aug 2008 15:56:31 +0000
Subject: [PATCH] Replication Conflict Test Suite

---
 opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
index bb8840d..655ac55 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/replication/replication.xml
@@ -40,7 +40,7 @@
           <iterate  var="_test" 
                     in="['totalupdate','binarycopy','ldifimport',
                          'resynchronization','basic','schema','failover',
-                         'encryption','changelog']">
+                         'encryption','changelog', 'conflict']">
             <sequence>
               <import machine="STAF_LOCAL_HOSTNAME"
                       file="'%s/testcases/replication/%s/%s.xml' % 

--
Gitblit v1.10.0