diff options
| author | slewis | 2014-03-02 03:12:17 +0000 |
|---|---|---|
| committer | slewis | 2014-03-02 03:12:17 +0000 |
| commit | 4f4440228db997c531e3b3d1f3583dd8409da5bd (patch) | |
| tree | 27d32b7049bf07bde0f43a5152f95a2979615059 /examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest | |
| parent | 5b9424d306984d6773829d2b715aac26a367dbe6 (diff) | |
| parent | e2d3e7a00a692aae3036601d17dba489e7b7c035 (diff) | |
| download | org.eclipse.ecf-4f4440228db997c531e3b3d1f3583dd8409da5bd.tar.gz org.eclipse.ecf-4f4440228db997c531e3b3d1f3583dd8409da5bd.tar.xz org.eclipse.ecf-4f4440228db997c531e3b3d1f3583dd8409da5bd.zip | |
Merge remote-tracking branch 'origin/master' into rfc1.1
Conflicts:
examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF
examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery/META-INF/MANIFEST.MF
examples/bundles/com.mycorp.examples.timeservice.provider.rest.consumer/META-INF/MANIFEST.MF
examples/bundles/com.mycorp.examples.timeservice.provider.rest.host/META-INF/MANIFEST.MF
Change-Id: I61808985b664924562007f9e12ea1777579bb50c
Diffstat (limited to 'examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest')
| -rw-r--r-- | examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF index 7772c4952..1fb839102 100644 --- a/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF +++ b/examples/bundles/com.mycorp.examples.timeservice.consumer.filediscovery.rest/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Timeservice Consuemr FileDiscovery Rest Bundle-SymbolicName: com.mycorp.examples.timeservice.consumer.filediscovery.rest Bundle-Version: 1.1.0.qualifier -Bundle-Vendor: MyCorp +Bundle-Vendor: Eclipse.org - ECF Bundle-RequiredExecutionEnvironment: J2SE-1.5 Remote-Service: timeservicerestendpointdescription.xml Require-Capability: osgi.extender; filter:=(&(osgi.extender=osgi.remoteserviceadmin) (version>=1.1)); effective:=active |