diff options
author | Maria Matejka <mq@ucw.cz> | 2022-07-15 14:57:02 +0200 |
---|---|---|
committer | Maria Matejka <mq@ucw.cz> | 2022-07-15 14:57:02 +0200 |
commit | 05673b16a87792baf8734dfcbf12ac2fd867f80b (patch) | |
tree | 7dd306058ea07dc41ec22d5429e8d1a9a6e7793b /nest/config.Y | |
parent | 1c2851ecfa94f3d0b732a267c6c2db8b817c37f4 (diff) | |
parent | c70b3198dc349127273d202ab8c36afeebb6d9d0 (diff) |
Merge commit 'c70b3198' into thread-next [lots of conflicts]
There were more conflicts that I'd like to see, most notably in route
export. If a bisect identifies this commit with something related, it
may be simply true that this commit introduces that bug. Let's hope it
doesn't happen.
Diffstat (limited to 'nest/config.Y')
-rw-r--r-- | nest/config.Y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nest/config.Y b/nest/config.Y index 525829b3..e894f7c4 100644 --- a/nest/config.Y +++ b/nest/config.Y @@ -386,7 +386,7 @@ debug_default: DEBUG PROTOCOLS debug_mask { new_config->proto_default_debug = $3; } | DEBUG CHANNELS debug_mask { new_config->channel_default_debug = $3; } | DEBUG COMMANDS expr { new_config->cli_debug = $3; } - | DEBUG PIPE bool { new_config->pipe_debug = $3; } + | DEBUG TABLES bool { new_config->table_debug = $3; } ; /* MRTDUMP PROTOCOLS is in systep/unix/config.Y */ |