diff options
| author | Peter Andersson <[email protected]> | 2013-09-02 11:42:27 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2013-09-02 11:43:10 +0200 |
| commit | 517879c44e0703b69fe8fc4499e656a318cd1a85 (patch) | |
| tree | e64cdbdf67096a3e4db9656517926491ea682d07 /lib/test_server/src/Makefile | |
| parent | fa1e0c642845cf7e72f0eef0af70baf5b87a0e3c (diff) | |
| parent | 170311bc90b45b97a8f86fbbd4325585cf8e2153 (diff) | |
| download | otp-517879c44e0703b69fe8fc4499e656a318cd1a85.tar.gz otp-517879c44e0703b69fe8fc4499e656a318cd1a85.tar.bz2 otp-517879c44e0703b69fe8fc4499e656a318cd1a85.zip | |
Merge remote branch 'origin/peppe/common_test/test_server_h_problem' into maint
* origin/peppe/common_test/test_server_h_problem:
Remove the obsolete test_server_h error handler
Tag sasl and error reports with suite, group, and function in log
Conflicts:
lib/common_test/src/cth_log_redirect.erl
OTP-11263
Diffstat (limited to 'lib/test_server/src/Makefile')
| -rw-r--r-- | lib/test_server/src/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/test_server/src/Makefile b/lib/test_server/src/Makefile index ebc5f5b71b..ab4dd4d95d 100644 --- a/lib/test_server/src/Makefile +++ b/lib/test_server/src/Makefile @@ -45,7 +45,6 @@ MODULES= test_server_ctrl \ test_server_node \ test_server \ test_server_sup \ - test_server_h \ erl2html2 TS_MODULES= \ |