diff options
| author | Anders Svensson <[email protected]> | 2014-01-28 11:10:26 +0100 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2014-01-28 11:10:26 +0100 |
| commit | 9c9fc59620b0e48d357be1e2d1faeb411d2fe31c (patch) | |
| tree | 3f8868b3574895416e5a432a3eda83bd60e00b37 /lib/diameter/vsn.mk | |
| parent | 9b0637d83248699eca1673d9b11a542cb2e63720 (diff) | |
| parent | 373aa17b2a66420c65a545de477cf54be4deda3e (diff) | |
| download | otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.tar.gz otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.tar.bz2 otp-9c9fc59620b0e48d357be1e2d1faeb411d2fe31c.zip | |
Merge branch 'anders/diameter/17.0_release/OTP-11605'
* anders/diameter/17.0_release/OTP-11605:
vsn -> 1.6
Remove upgrade-related code
Update appup for 17.0
Avoid type gen_sctp:open_option() until it actually exists
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 9fda067f2b..54019fa46c 100644 --- a/lib/diameter/vsn.mk +++ b/lib/diameter/vsn.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2013. All Rights Reserved. +# Copyright Ericsson AB 2010-2014. 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 @@ -18,5 +18,5 @@ # %CopyrightEnd% APPLICATION = diameter -DIAMETER_VSN = 1.5 +DIAMETER_VSN = 1.6 APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN) |