diff options
| author | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-10-11 15:16:02 +0200 |
| commit | 9cccec48c38544df1d00230aeb340b37890ab8c8 (patch) | |
| tree | ac04a6dbca68d4f93f6addc416579baaefa220b2 /erts/emulator | |
| parent | b42792cb96262b1c10baf3c756e439f68b1dc8e1 (diff) | |
| parent | 919ef5de2858e606d4a9be3e0e995b0802c76e33 (diff) | |
| download | otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.gz otp-9cccec48c38544df1d00230aeb340b37890ab8c8.tar.bz2 otp-9cccec48c38544df1d00230aeb340b37890ab8c8.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
vsn -> 2.1.1
Update appup and code_change for ERIERL-83
Fix missing monitor in diameter_reg
Diffstat (limited to 'erts/emulator')
0 files changed, 0 insertions, 0 deletions