diff options
| author | Anders Svensson <[email protected]> | 2018-03-06 09:31:37 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2018-03-06 09:31:37 +0100 |
| commit | 84a2ed39f035dd1a569dca370dc11876993c6ecf (patch) | |
| tree | 86093f4f57a021c83db143816a237a70258036c8 /lib/diameter/vsn.mk | |
| parent | 7ac3e7857f49b231ada6517e6a2c92f302d54e0c (diff) | |
| parent | cd1edc1f9920a518eecb36fbe36a0ee2fc96c84a (diff) | |
| download | otp-84a2ed39f035dd1a569dca370dc11876993c6ecf.tar.gz otp-84a2ed39f035dd1a569dca370dc11876993c6ecf.tar.bz2 otp-84a2ed39f035dd1a569dca370dc11876993c6ecf.zip | |
Merge branch 'anders/diameter/20.3/OTP-14946' into maint
* anders/diameter/20.3/OTP-14946:
vsn -> 2.1.4
Update appup for 20.3
Update service_info examples in doc
Fix inaccurate comment
Diffstat (limited to 'lib/diameter/vsn.mk')
| -rw-r--r-- | lib/diameter/vsn.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk index 0c852d75cd..b0fb4ada28 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -1,6 +1,6 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2017. All Rights Reserved. +# Copyright Ericsson AB 2010-2018. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,5 +17,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 2.1.3 +DIAMETER_VSN = 2.1.4 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |