aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-06-17 09:53:22 +0200
committerIngela Anderton Andin <[email protected]>2016-06-17 09:53:22 +0200
commitf8d466b82f156e656371ab4c0f5af34217cbd655 (patch)
treeba7eb795b8cdd42d37217dbe9877286766aa67d3
parentbd1dd3cdba13da97cc84ac0dc69ed772f3878c74 (diff)
parentbae308c05621d20af763b603db21c9f515733804 (diff)
downloadotp-f8d466b82f156e656371ab4c0f5af34217cbd655.tar.gz
otp-f8d466b82f156e656371ab4c0f5af34217cbd655.tar.bz2
otp-f8d466b82f156e656371ab4c0f5af34217cbd655.zip
Merge branch 'ingela/ssl/runtime-dep'
* ingela/ssl/runtime-dep: ssl: Add new public_key to runtime dependencies
-rw-r--r--lib/ssl/src/ssl.app.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index 6467cedf9d..b26efbd88f 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -55,7 +55,7 @@
{applications, [crypto, public_key, kernel, stdlib]},
{env, []},
{mod, {ssl_app, []}},
- {runtime_dependencies, ["stdlib-3.0","public_key-1.0","kernel-3.0",
+ {runtime_dependencies, ["stdlib-3.0","public_key-1.2","kernel-3.0",
"erts-7.0","crypto-3.3", "inets-5.10.7"]}]}.