Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-02-12 01:24:36 -0500
committerslewis2014-02-12 01:24:36 -0500
commit5b2dc1813e83473b0f645be329cd1e450c12ebf9 (patch)
treee1b0b4e6e82f62cb29b381b85e4a385843e74770 /incubation
parentfb4c29bdffe1617e3e4708bf98a7f8b43fb469e0 (diff)
parent332a53ac5b24b4b936c0f3f84fca56ec3ba4476b (diff)
downloadorg.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.tar.gz
org.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.tar.xz
org.eclipse.ecf-5b2dc1813e83473b0f645be329cd1e450c12ebf9.zip
Merge remote-tracking branch 'origin/master' into rfc1.1
Conflicts: osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/META-INF/MANIFEST.MF osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java Change-Id: I9fb9ba4cebfdf7515fc05d7d7716585cdac797e7
Diffstat (limited to 'incubation')
-rw-r--r--incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF2
1 files changed, 1 insertions, 1 deletions
diff --git a/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF b/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
index 4a118ba29..c15c04ec9 100644
--- a/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
+++ b/incubation/bundles/org.eclipse.ecf.provider.endpointdescription.localdiscovery/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Import-Package: org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.security,
org.eclipse.ecf.discovery;version="4.0.0",
org.eclipse.ecf.discovery.identity,
- org.eclipse.ecf.osgi.services.remoteserviceadmin,
+ org.eclipse.ecf.osgi.services.remoteserviceadmin;version="2.0.0",
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.remoteserviceadmin;version="1.0",

Back to the top