diff options
| author | Eike Stepper | 2016-10-05 05:33:22 +0000 |
|---|---|---|
| committer | Eike Stepper | 2016-10-05 05:33:22 +0000 |
| commit | 95d11d623b78209da114873fe169995fee7af59c (patch) | |
| tree | 7f214e0b0a42ef63cd22cf83d167b30f3277ed98 /plugins/org.eclipse.emf.cdo.server.product | |
| parent | 023a17a1a415b2c6272ff1a81f54c0b6f7b4e51a (diff) | |
| download | cdo-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.server.product')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml index 7395e3c310..02168adb9e 100644 --- a/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml +++ b/plugins/org.eclipse.emf.cdo.server.product/config/cdo-server.xml @@ -22,6 +22,7 @@ <property name="ensureReferentialIntegrity" value="false"/> <property name="allowInterruptRunningQueries" value="true"/> <property name="idGenerationLocation" value="STORE"/> <!-- 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"/> |