s3:script: Replace --merge by --merge-by-timestamp in samba-log-parser
authorPavel Filipenský <pfilipensky@samba.org>
Wed, 28 Jun 2023 12:59:29 +0000 (14:59 +0200)
committerPavel Filipensky <pfilipensky@samba.org>
Thu, 20 Jul 2023 19:14:05 +0000 (19:14 +0000)
commitca5cc05b22bf92dd7236d2c0d4a424340a0048f3
tree42bf5967db72fbccb7187217608a8202cfc56839
parent16386bfd4cd10bbb4a5588973220212287a2f868
s3:script: Replace --merge by --merge-by-timestamp in samba-log-parser

For --merge-by-timestamp the traces do not need to contain the traceid
header field.

Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Pavel Filipensky <pfilipensky@samba.org>
Autobuild-Date(master): Thu Jul 20 19:14:05 UTC 2023 on atb-devel-224
docs-xml/manpages/samba-log-parser.1.xml
source3/script/samba-log-parser