diff options
| author | Erlang/OTP <[email protected]> | 2010-06-15 17:44:30 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-15 17:44:30 +0200 |
| commit | c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a (patch) | |
| tree | 57bbee79eb46cc0945c3a56b157333bc60f8bbbf /lib/kernel | |
| parent | 8495f694672a2bb6d1a4a25f9a93aab5c9fc916b (diff) | |
| download | otp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.tar.gz otp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.tar.bz2 otp-c1e94fa9a6fe4ae717d35dfbd1b628dc2e06d26a.zip | |
The R14A releaseOTP_R14A
Final merge of all unexpected differences from dev to release.
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/notes.xml | 31 | ||||
| -rw-r--r-- | lib/kernel/vsn.mk | 4 |
2 files changed, 33 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml index cd98d356bd..b503716037 100644 --- a/lib/kernel/doc/src/notes.xml +++ b/lib/kernel/doc/src/notes.xml @@ -114,6 +114,37 @@ </section> +<section><title>Kernel 2.13.5.3</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + A bug introduced in Kernel 2.13.5.2 has been fixed.</p> + <p> + Own Id: OTP-8686 Aux Id: OTP-8643</p> + </item> + </list> + </section> + +</section> + +<section><title>Kernel 2.13.5.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Under certain circumstances the net kernel could hang. + (Thanks to Scott Lystig Fritchie.)</p> + <p> + Own Id: OTP-8643 Aux Id: seq11584</p> + </item> + </list> + </section> + +</section> + <section><title>Kernel 2.13.5.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk index 64a358f114..7dd99b37dd 100644 --- a/lib/kernel/vsn.mk +++ b/lib/kernel/vsn.mk @@ -1,4 +1,4 @@ -# +# # %CopyrightBegin% # # Copyright Ericsson AB 1997-2010. All Rights Reserved. @@ -15,6 +15,6 @@ # under the License. # # %CopyrightEnd% -# +# KERNEL_VSN = 2.14 |