diff options
| author | Peter Andersson <[email protected]> | 2015-05-11 23:23:54 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2015-05-11 23:23:54 +0200 |
| commit | 0d91ab8cf4900c58b7b5a20369b15f641b22a204 (patch) | |
| tree | 1d68b71bceda51821f0f1dbcb0404f9cf6077c72 | |
| parent | 67282328c2bf85ece471b82724336fb3a5821b94 (diff) | |
| parent | 603ffe32e1947e2c9550eabe15c477c343cbaba1 (diff) | |
| download | otp-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
| -rw-r--r-- | lib/common_test/src/common_test.app.src | 11 | ||||
| -rw-r--r-- | lib/common_test/vsn.mk | 2 | ||||
| -rw-r--r-- | lib/test_server/src/test_server.app.src | 6 | ||||
| -rw-r--r-- | lib/test_server/vsn.mk | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/lib/common_test/src/common_test.app.src b/lib/common_test/src/common_test.app.src index 580d5dbd7b..0be1466fc9 100644 --- a/lib/common_test/src/common_test.app.src +++ b/lib/common_test/src/common_test.app.src @@ -63,9 +63,10 @@ ct_master_logs]}, {applications, [kernel,stdlib]}, {env, []}, - {runtime_dependencies,["xmerl-1.3.7","webtool-0.8.10","tools-2.6.14", - "test_server-3.7.1","stdlib-2.0","ssh-3.0.1", - "snmp-4.25.1","sasl-2.4","runtime_tools-1.8.14", - "kernel-3.0","inets-5.10","erts-6.0", - "debugger-4.0","crypto-3.3","compiler-5.0"]}]}. + {runtime_dependencies,["xmerl-1.3.8","tools-2.8", + "test_server-3.9","stdlib-2.5","ssh-4.0", + "snmp-5.1.2","sasl-2.4.2","runtime_tools-1.8.16", + "kernel-4.0","inets-6.0","erts-7.0", + "debugger-4.1","crypto-3.6","compiler-6.0", + "observer-2.1"]}]}. diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk index e2d921729c..ff2bd20ab3 100644 --- a/lib/common_test/vsn.mk +++ b/lib/common_test/vsn.mk @@ -1 +1 @@ -COMMON_TEST_VSN = 1.10.1 +COMMON_TEST_VSN = 1.11 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"]}]}. diff --git a/lib/test_server/vsn.mk b/lib/test_server/vsn.mk index 2a2ed2b3b0..fd9e4e6d74 100644 --- a/lib/test_server/vsn.mk +++ b/lib/test_server/vsn.mk @@ -1 +1 @@ -TEST_SERVER_VSN = 3.8.1 +TEST_SERVER_VSN = 3.9 |