aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-05-06 13:01:07 +0200
committerZandra Hird <[email protected]>2015-05-06 13:01:07 +0200
commit0440e0e45835de5adbe790f9437492d734c6c4e1 (patch)
tree978ff1a48ae243e69fca96cce5eb2654b66c8076 /erts
parent83ff5ec3ced8ce1c456bfdf75fcbf5be01385388 (diff)
parentefbfe9602983ff451b864e557bdf3733222b78ba (diff)
downloadotp-0440e0e45835de5adbe790f9437492d734c6c4e1.tar.gz
otp-0440e0e45835de5adbe790f9437492d734c6c4e1.tar.bz2
otp-0440e0e45835de5adbe790f9437492d734c6c4e1.zip
Merge branch 'maint'
Conflicts: OTP_VERSION erts/vsn.mk lib/test_server/src/erl2html2.erl
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml16
-rw-r--r--erts/etc/common/ct_run.c2
2 files changed, 17 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a2b4ae49a4..35e6e55e72 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,22 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 6.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ The VTS mode in Common Test has been modified to use a
+ private version of the Webtool application (ct_webtool).</p>
+ <p>
+ Own Id: OTP-12704 Aux Id: OTP-10922 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 6.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/etc/common/ct_run.c b/erts/etc/common/ct_run.c
index bb59b93998..9e67b94f30 100644
--- a/erts/etc/common/ct_run.c
+++ b/erts/etc/common/ct_run.c
@@ -239,7 +239,7 @@ int main(int argc, char** argv)
*/
if (ct_mode == VTS_MODE) {
- PUSH4("-s", "webtool", "script_start", "vts");
+ PUSH4("-s", "ct_webtool", "script_start", "vts");
if (browser[0] != '\0') PUSH(browser);
PUSH3("-s", "ct_run", "script_start");
}