Merge branch 'anders/diameter/release/R16B01/OTP-11120' into maint

* anders/diameter/release/R16B01/OTP-11120:
  vsn -> 1.4.2
  Update appup for R16B01
  Trailing whitespace and copyright fixes
  Minor macro simplification
  Move app/appsrc from src/base into src

1 files changed, 78 insertions, 0 deletions

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
new file mode 100644
index 0000000000..62ace16faa
--- /dev/null
+++ b/lib/diameter/src/diameter.appup.src
@@ -0,0 +1,78 @@
+%% This is an -*- erlang -*- file.
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2010-2013. 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/.
+%%
+%% 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.
+%%
+%% %CopyrightEnd%
+%%
+
+{"%VSN%",
+ [
+  {"0.9",   [{restart_application, diameter}]},  %% R14B03
+  {"0.10",  [{restart_application, diameter}]},  %% R14B04
+  {"1.0",   [{restart_application, diameter}]},  %% R15B
+  {"1.1",   [{restart_application, diameter}]},  %% R15B01
+  {"1.2",   [{restart_application, diameter}]},  %% R15B02
+  {"1.2.1", [{restart_application, diameter}]},
+  {"1.3",   [{restart_application, diameter}]},  %% R15B03
+  {"1.3.1", [{restart_application, diameter}]},
+  {"1.4",   [{restart_application, diameter}]},  %% R16A
+  {"1.4.1", [{load_module, diameter_reg},        %% R16B
+             {load_module, diameter_stats},
+             {load_module, diameter_traffic},
+             {load_module, diameter_service},
+             {load_module, diameter_config},
+             {load_module, diameter_peer},
+             {load_module, diameter_peer_fsm},
+             {load_module, diameter_watchdog},
+             {load_module, diameter_capx},
+             {load_module, diameter_codec},
+             {load_module, diameter_gen_base_rfc3588},
+             {load_module, diameter_gen_base_accounting},
+             {load_module, diameter_gen_base_rfc6733},
+             {load_module, diameter_gen_base_acct6733},
+             {load_module, diameter_tcp},
+             {load_module, diameter_lib},
+             {load_module, diameter}]},
+  {"1.4.1.1", [{load_module, diameter_traffic},
+               {load_module, diameter_service},
+               {load_module, diameter_config},
+               {load_module, diameter_peer},
+               {load_module, diameter_peer_fsm},
+               {load_module, diameter_watchdog},
+               {load_module, diameter_capx},
+               {load_module, diameter_codec},
+               {load_module, diameter_gen_base_rfc3588},
+               {load_module, diameter_gen_base_accounting},
+               {load_module, diameter_gen_base_rfc6733},
+               {load_module, diameter_gen_base_acct6733},
+               {load_module, diameter_tcp},
+               {load_module, diameter_lib},
+               {load_module, diameter}]}
+ ],
+ [
+  {"0.9",   [{restart_application, diameter}]},
+  {"0.10",  [{restart_application, diameter}]},
+  {"1.0",   [{restart_application, diameter}]},
+  {"1.1",   [{restart_application, diameter}]},
+  {"1.2",   [{restart_application, diameter}]},
+  {"1.2.1", [{restart_application, diameter}]},
+  {"1.3",   [{restart_application, diameter}]},
+  {"1.3.1", [{restart_application, diameter}]},
+  {"1.4",   [{restart_application, diameter}]},
+  {"1.4.1", [{restart_application, diameter}]},
+  {"1.4.1.1", [{restart_application, diameter}]}
+ ]
+}.