aboutsummaryrefslogtreecommitdiffstats
path: root/lib/test_server/src
diff options
context:
space:
mode:
authorPeter Andersson <[email protected]>2015-05-11 23:23:54 +0200
committerPeter Andersson <[email protected]>2015-05-11 23:23:54 +0200
commit0d91ab8cf4900c58b7b5a20369b15f641b22a204 (patch)
tree1d68b71bceda51821f0f1dbcb0404f9cf6077c72 /lib/test_server/src
parent67282328c2bf85ece471b82724336fb3a5821b94 (diff)
parent603ffe32e1947e2c9550eabe15c477c343cbaba1 (diff)
downloadotp-0d91ab8cf4900c58b7b5a20369b15f641b22a204.tar.gz
otp-0d91ab8cf4900c58b7b5a20369b15f641b22a204.tar.bz2
otp-0d91ab8cf4900c58b7b5a20369b15f641b22a204.zip
Merge branch 'peppe/test_tools_vsn_and_deps'
* peppe/test_tools_vsn_and_deps: Update version numbers and app dependencies
Diffstat (limited to 'lib/test_server/src')
-rw-r--r--lib/test_server/src/test_server.app.src6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/test_server/src/test_server.app.src b/lib/test_server/src/test_server.app.src
index 5538e8b851..bdd9d28444 100644
--- a/lib/test_server/src/test_server.app.src
+++ b/lib/test_server/src/test_server.app.src
@@ -32,7 +32,7 @@
test_server_break_process]},
{applications, [kernel,stdlib]},
{env, []},
- {runtime_dependencies, ["tools-2.6.14","stdlib-2.0","runtime_tools-1.8.14",
- "observer-2.0","kernel-3.0","inets-5.10",
- "syntax_tools-1.6.16","erts-7.0"]}]}.
+ {runtime_dependencies, ["tools-2.8","stdlib-2.5","runtime_tools-1.8.16",
+ "observer-2.1","kernel-4.0","inets-6.0",
+ "syntax_tools-1.7","erts-7.0"]}]}.