diff options
| author | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-23 16:13:43 +0200 |
| commit | 1ead5e977d307ae391fdfd34e28fa5d587db2855 (patch) | |
| tree | b5324d56ca67a1f427b876f03536d98025f31945 /lib/inets/src/inets_app | |
| parent | 92657321ac647f343c6b88985d66a2d611fd982d (diff) | |
| parent | 55bb3e1faf613c51ec59c9ee7ab4b4e967f30fda (diff) | |
| download | otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.gz otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.tar.bz2 otp-1ead5e977d307ae391fdfd34e28fa5d587db2855.zip | |
Merge branch 'dev' into major
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
lib/inets/test/httpc_cookie_SUITE.erl
lib/inets/vsn.mk
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 65cee34cb3..e6d315819c 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,6 +18,11 @@ {"%VSN%", [ + {"5.7.1", + [ + {restart_application, inets} + ] + }, {"5.7", [ {restart_application, inets} @@ -30,6 +35,11 @@ } ], [ + {"5.7.1", + [ + {restart_application, inets} + ] + }, {"5.7", [ {restart_application, inets} |