From 207df6fc406e81bfeebdff7f404bd242ff3f099f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 7 May 2024 06:48:35 +0200 Subject: Merging upstream version 0.12.2. Signed-off-by: Daniel Baumann --- ...st_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/expected/test_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out') diff --git a/test/expected/test_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out b/test/expected/test_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out index 128f5ab..3363f23 100644 --- a/test/expected/test_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out +++ b/test/expected/test_json_format.sh_6fbe20faa161ab9fa77df7568fff84bf3e47e920.out @@ -1,4 +1,4 @@ -log_line,log_part,log_time,log_idle_msecs,log_level,log_mark,log_comment,log_tags,log_filters,user,cl -0,,2013-09-06 20:00:49.124,0,info,0,,,,,com.exmaple.foo -1,,2013-09-06 22:00:49.124,7200000,info,0,,,,steve@example.com,com.exmaple.foo -3,,2013-09-06 22:01:49.124,60000,error,0,,,,,com.exmaple.foo +log_line,log_time,log_level,user,cl,log_part,log_idle_msecs,log_mark,log_comment,log_tags,log_annotations,log_filters +0,2013-09-06 20:00:49.124,info,,com.exmaple.foo,,0,0,,,, +1,2013-09-06 22:00:49.124,info,steve@example.com,com.exmaple.foo,,7200000,0,,,, +3,2013-09-06 22:01:49.124,error,,com.exmaple.foo,,60000,0,,,, -- cgit v1.2.3