aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-02-15 15:14:57 +0100
committerErlang/OTP <[email protected]>2019-02-15 15:14:57 +0100
commite05a1daffc62596b33bc6afe684e5f3f5291c18c (patch)
treebdb7601646d5fe87ede02335386db01eab549dac
parente35336e4b4b6d0e0451c748a2f16dc14fd535422 (diff)
downloadotp-e05a1daffc62596b33bc6afe684e5f3f5291c18c.tar.gz
otp-e05a1daffc62596b33bc6afe684e5f3f5291c18c.tar.bz2
otp-e05a1daffc62596b33bc6afe684e5f3f5291c18c.zip
Prepare release
-rw-r--r--lib/common_test/doc/src/notes.xml19
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--make/otp_version_tickets3
3 files changed, 21 insertions, 3 deletions
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index 7e909b24cd..ef8b70f1a3 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,25 @@
<file>notes.xml</file>
</header>
+<section><title>Common_Test 1.15.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The status of a test case which failed with timetrap
+ timeout in <c>end_per_testcase</c> could not be modified
+ by returning <c>{fail,Reason}</c> from a
+ <c>post_end_per_testcase</c> hook function. This is now
+ corrected.</p>
+ <p>
+ Own Id: OTP-15584 Aux Id: ERIERL-282 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Common_Test 1.15.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index ea3e9871cb..c8dfa6beb2 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.15.4
+COMMON_TEST_VSN = 1.15.4.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 5664ca3244..7313fa0342 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,2 +1 @@
-OTP-15430
-OTP-15569
+OTP-15584