aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/vsn.mk
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-10-25 08:52:04 +0200
committerJohn Högberg <[email protected]>2017-10-25 08:52:04 +0200
commitc26f0e58f440859abbfb9b4e3570713ac722e0da (patch)
tree6bcbc29c8f4501c05a598262787ef06fb5a7666c /lib/diameter/vsn.mk
parent541ee20b9eaefed7802f08cecddfbd12e5f3b516 (diff)
parenta98379d0519c28f9bc9b673ed2c09fb1ad52456e (diff)
downloadotp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.gz
otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.tar.bz2
otp-c26f0e58f440859abbfb9b4e3570713ac722e0da.zip
Merge branch 'maint-20' into maint
* maint-20: Updated OTP version Update release notes Update version numbers erts: Fix so that bind correct schedulers Update version Fix error handling when decoding an AVP with an alternate dictionary Remove unused function arguments Fix faulty recursion vsn -> 2.1.2 Update appup for ERIERL-14684 Fix speling error 'sndbuf' -> 'recbuf' Add zlib:set_controlling_process/2
Diffstat (limited to 'lib/diameter/vsn.mk')
-rw-r--r--lib/diameter/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index f73f68da0b..bfb260ed8f 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.1.1
+DIAMETER_VSN = 2.1.2
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)