diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-05-28 15:43:05 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-05-28 15:43:05 +0200 |
| commit | 6fe0fae81adf2f6a222dccb3222309e205c6ffdc (patch) | |
| tree | a6d4e2c6cd7ec700f890dc47a5febeb03ff29498 /erts/etc | |
| parent | 2925fbba49237ff6b6e2691f52c4afb2c0447e46 (diff) | |
| parent | 09b461e9c851abfaf7e1d697232e3af3ddedce9f (diff) | |
| download | otp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.tar.gz otp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.tar.bz2 otp-6fe0fae81adf2f6a222dccb3222309e205c6ffdc.zip | |
Merge branch 'richcarl/warnings-by-default/OTP-12781'
* richcarl/warnings-by-default/OTP-12781:
stdlib: Use warning channel in test qlc_SUITE:otp_6964/1
stdlib: Fix testcase for qlc_SUITE
kernel: Fix code_SUITE with respect to new logger default
Map error logger warnings to warning messages by default
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/common/erlexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 23226909a7..d6544a2829 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -1172,7 +1172,7 @@ usage_aux(void) "[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] " "[+SP PERCENTAGE_SCHEDULERS:PERCENTAGE_SCHEDULERS_ONLINE] " "[+T LEVEL] [+V] [+v] " - "[+W<i|w>] [+z MISC_OPTION] [args ...]\n"); + "[+W<i|w|e>] [+z MISC_OPTION] [args ...]\n"); exit(1); } |