Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 35 insertions, 22 deletions

diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index b3659366a4..46da79cfe3 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,18 +2,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2015. All Rights Reserved.
 %%
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -165,25 +166,37 @@
 %%      |          |           |         |         |
 %%      v          v           v         v         v
 %%    3.17  <-  3.16.1  <-  3.15.2 <- 3.14.2 <- 3.11.4
+%%      | 
+%%      v 
+%%   3.17.0.1
+%%      | 
+%%      v 
+%%   3.17.0.2
+%%      | 
+%%      v 
+%%   3.17.0.3  
+%%      |
+%%      v
+%%   3.17.1
+%%      |
+%%      v
+%%   3.17.2
+%%      |
+%%      v
+%%   3.17.3
+%%      |
+%%      v
+%%   3.18
 %%
 %%
 
 {"%VSN%",
  [
-  {"3.16.0.3", 
-   [
-    {update, megaco_flex_scanner_handler, {advanced, upgrade_from_pre_3_17}, 
-     soft_purge, soft_purge, []}
-   ]
-  }
+  {<<"3\\..*">>, [{restart_application, megaco}]}
  ],
+
  [
-  {"3.16.0.3", 
-   [
-    {update, megaco_flex_scanner_handler, {advanced, downgrade_to_pre_3_17}, 
-     soft_purge, soft_purge, []}
-   ]
-  }
+  {<<"3\\..*">>, [{restart_application, megaco}]}
  ]
 }.