Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-05 01:33:22 -0400
committerEike Stepper2016-10-05 01:33:22 -0400
commit95d11d623b78209da114873fe169995fee7af59c (patch)
tree7f214e0b0a42ef63cd22cf83d167b30f3277ed98 /plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml
parent023a17a1a415b2c6272ff1a81f54c0b6f7b4e51a (diff)
downloadcdo-95d11d623b78209da114873fe169995fee7af59c.tar.gz
cdo-95d11d623b78209da114873fe169995fee7af59c.tar.xz
cdo-95d11d623b78209da114873fe169995fee7af59c.zip
[504014] Make merge information available in CDOCommitInfo
https://bugs.eclipse.org/bugs/show_bug.cgi?id=504014
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml')
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/config/cdo-server.xml1
1 files changed, 1 insertions, 0 deletions
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"/>

Back to the top