From 95d11d623b78209da114873fe169995fee7af59c Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 5 Oct 2016 07:33:22 +0200
Subject: [504014] Make merge information available in CDOCommitInfo

https://bugs.eclipse.org/bugs/show_bug.cgi?id=504014---
 .../examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config')

diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
index f953dd6469..4ee090478a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
@@ -22,6 +22,7 @@
     <property name="ensureReferentialIntegrity" value="false"/>
     <property name="allowInterruptRunningQueries" value="true"/>
     <property name="idGenerationLocation" value="CLIENT"/> <!-- Possible values: STORE | CLIENT -->
+    <property name="commitInfoStorage" value="WITH_MERGE_SOURCE"/> <!-- Possible values: NO | YES | WITH_MERGE_SOURCE -->
     <property name="serializeCommits" value="false"/>
     <property name="optimisticLockingTimeout" value="10000"/>
 
-- 
cgit v1.2.3