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.mongodb | |
| 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.mongodb')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF | 8 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF index 30eed6b900..bc968bbc34 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.server.mongodb;singleton:=true -Bundle-Version: 4.0.400.qualifier +Bundle-Version: 4.0.500.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.400";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb", - org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.400";x-internal:=true, - org.eclipse.emf.cdo.server.mongodb;version="4.0.400" +Export-Package: org.eclipse.emf.cdo.server.internal.mongodb;version="4.0.500";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.mongodb", + org.eclipse.emf.cdo.server.internal.mongodb.bundle;version="4.0.500";x-internal:=true, + org.eclipse.emf.cdo.server.mongodb;version="4.0.500" Import-Package: com.mongodb;version="[2.0.0,3.0.0)", com.mongodb.gridfs;version="[2.0.0,3.0.0)", com.mongodb.io;version="[2.0.0,3.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java index 403d830234..f0aad8462d 100644 --- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java +++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java @@ -921,7 +921,8 @@ public class Commits extends Coll String user = (String)doc.get(COMMITS_USER); String comment = (String)doc.get(COMMITS_COMMENT); - CDOCommitInfo commitInfo = commitManager.createCommitInfo(commitBranch, time, previous, user, comment, null); + CDOCommitInfo commitInfo = commitManager.createCommitInfo(commitBranch, time, previous, user, comment, null, + null); handler.handleCommitInfo(commitInfo); return null; } |