tree ed73bb14c2c86585cb35a64316ed10674e0c8989
parent e6437b433b02d754e2ca23d90146c4161202ca98
parent 936e8f3eb02a05b0cf88e58ae7ab37dc36890c5c
author Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1482346059 +0100
committer Johannes Faltermeier <jfaltermeier@eclipsesource.com> 1482346059 +0100

Merge branch 'maintenance_1.8' into develop

# Conflicts:
#	bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
#	bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
#	bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.client/pom.xml
#	bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
#	bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.common.model/pom.xml
#	bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.common/pom.xml
#	bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.ecore/pom.xml
#	bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
#	bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
#	bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
#	bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
#	bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
#	bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
#	bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
#	bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
#	bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
#	bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
#	bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
#	bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
#	bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.migration/pom.xml
#	bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
#	bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
#	bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
#	bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
#	bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
#	bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.server.model/pom.xml
#	bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
#	bundles/org.eclipse.emf.emfstore.server/pom.xml
#	features/org.eclipse.emf.emfstore.client.feature/feature.xml
#	features/org.eclipse.emf.emfstore.client.feature/pom.xml
#	features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
#	features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
#	features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
#	features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
#	features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
#	features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
#	features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
#	features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
#	features/org.eclipse.emf.emfstore.common.feature/feature.xml
#	features/org.eclipse.emf.emfstore.common.feature/pom.xml
#	features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
#	features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
#	features/org.eclipse.emf.emfstore.example.feature/feature.xml
#	features/org.eclipse.emf.emfstore.example.feature/pom.xml
#	features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
#	features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
#	features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
#	features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
#	features/org.eclipse.emf.emfstore.license.feature/feature.xml
#	features/org.eclipse.emf.emfstore.license.feature/pom.xml
#	features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
#	features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
#	features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
#	features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
#	features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
#	features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
#	features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
#	features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
#	features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
#	features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
#	features/org.eclipse.emf.emfstore.server.feature/feature.xml
#	features/org.eclipse.emf.emfstore.server.feature/pom.xml
#	features/org.eclipse.emf.emfstore.test.feature/feature.xml
#	features/org.eclipse.emf.emfstore.test.feature/pom.xml
#	releng/_target/pom.xml
#	releng/emfstore-parent/pom.xml
#	releng/org.eclipse.emf.emfstore.p2repository/pom.xml
#	releng/org.eclipse.emf.emfstore.products/pom.xml
#	releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
#	releng/org.eclipse.emf.emfstore.releng.features/pom.xml
#	releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
#	tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
#	tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.test/pom.xml
#	tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
#	tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
#	tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
#	tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
#	tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.performance.test/pom.xml
#	tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.server.test/pom.xml
#	tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
#	tests/org.eclipse.emf.emfstore.test.common/pom.xml
#	tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
#	tests/org.eclipse.emf.emfstore.test.model/pom.xml