diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:17 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-09-18 09:25:17 +0200 |
| commit | 9d5aa4ee276c142e9800262333103be5da600a53 (patch) | |
| tree | 0e74e28be1b90dc437a262355d62b519a8570328 | |
| parent | 9b01223a5ff7e157c57ef832afc985662c97e123 (diff) | |
| parent | ffa4f7bfc1d06f295c2d2b4a9f529abe009040e2 (diff) | |
| download | otp-9d5aa4ee276c142e9800262333103be5da600a53.tar.gz otp-9d5aa4ee276c142e9800262333103be5da600a53.tar.bz2 otp-9d5aa4ee276c142e9800262333103be5da600a53.zip | |
Merge branch 'ia/inets/next/version' into maint
* ia/inets/next/version:
inets: Prepare for release
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 2 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index d3da76d789..a9fbb1c3f7 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,9 +18,11 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] }. diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 5395df1d07..a6aeedfe12 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.0 +INETS_VSN = 6.0.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |