diff options
author | Jeff Johnston | 2017-11-24 18:14:10 +0000 |
---|---|---|
committer | Jeff Johnston | 2017-11-25 00:39:05 +0000 |
commit | 2acc2320c65dfadc8ecc21de1896bf0ffd5097a6 (patch) | |
tree | 4202ba84fc6c187aee2793f989f806119d2de821 | |
parent | a944a54ca2f82e4598cf403e15b6e32a51d49987 (diff) | |
download | org.eclipse.linuxtools-2acc2320c65dfadc8ecc21de1896bf0ffd5097a6.tar.gz org.eclipse.linuxtools-2acc2320c65dfadc8ecc21de1896bf0ffd5097a6.tar.xz org.eclipse.linuxtools-2acc2320c65dfadc8ecc21de1896bf0ffd5097a6.zip |
Bug 525915 - terminal produced by "Execute Shell" times out after 30 seconds
- point Linux Tools target file to repo containing upstream patch
back-ported to 6.1.1 (6.1.1a)
Change-Id: If6c94740e330038312391b5982b4c45d9c449fbf
Reviewed-on: https://git.eclipse.org/r/112272
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
(cherry picked from commit c1b7a88caa2533e659f9d66e3c2562822857630b)
Reviewed-on: https://git.eclipse.org/r/112282
-rw-r--r-- | releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target index 5d80ea5c7f..61703dbd04 100644 --- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target +++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target @@ -17,8 +17,6 @@ <unit id="com.github.jnr.unixsocket" version="0.12.0.v20161107-2054"/> <unit id="com.google.gson" version="2.7.0.v20170129-0911"/> <unit id="com.google.guava" version="21.0.0.v20170206-1425"/> -<unit id="com.spotify.docker.client" version="6.1.1.v20170301-1624"/> -<unit id="com.spotify.docker.client.source" version="6.1.1.v20170301-1624"/> <unit id="javassist" version="3.13.0.GA_v201209210905"/> <unit id="javax.ws.rs" version="2.0.1.v201504171603"/> <unit id="jnr.x86asm" version="1.0.2.v201505052040"/> @@ -61,6 +59,11 @@ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository"/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="com.spotify.docker.client" version="6.1.1.v20171124-1825"/> +<unit id="com.spotify.docker.client.source" version="6.1.1.v20171124-1825"/> +<repository location="http://download.eclipse.org/linuxtools/docker-client-6.1.1a"/> +</location> +<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/> <unit id="org.eclipse.cdt.feature.group" version="0.0.0"/> <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/> |