diff options
| author | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
| commit | 42ef7086abd717e7a428804fe387b782abab9827 (patch) | |
| tree | b4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /lib/sasl/src/rb.erl | |
| parent | 30a9f962d349f322f389ebc056e972f871e689a8 (diff) | |
| parent | 9022ef27b8628ca680654d542b4d520426480c2d (diff) | |
| download | otp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2 otp-42ef7086abd717e7a428804fe387b782abab9827.zip | |
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'lib/sasl/src/rb.erl')
| -rw-r--r-- | lib/sasl/src/rb.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/rb.erl b/lib/sasl/src/rb.erl index 38e486b7a7..13753565d8 100644 --- a/lib/sasl/src/rb.erl +++ b/lib/sasl/src/rb.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% Copyright Ericsson AB 1996-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -169,7 +169,7 @@ print_filters() -> print_dates() -> io:format(" - {StartDate, EndDate}~n"), - io:format(" StartDate = EndDate = {{Y-M-D},{H,M,S}} ~n"), + io:format(" StartDate = EndDate = {{Y,M,D},{H,M,S}} ~n"), io:format(" prints the reports with date between StartDate and EndDate~n"), io:format(" - {StartDate, from}~n"), io:format(" prints the reports with date greater than StartDate~n"), |