diff options
| -rw-r--r-- | docs/configuration/service/conntrack-sync.rst | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst index 5ef80396..db23c92f 100644 --- a/docs/configuration/service/conntrack-sync.rst +++ b/docs/configuration/service/conntrack-sync.rst @@ -98,18 +98,15 @@ Configuration This diable the external cache and directly injects the flow-states into the in-kernel Connection Tracking System of the backup firewall. -<<<<<<< HEAD -======= .. cfgcmd:: set service conntrack-sync disable-syslog Disable connection logging via Syslog. -.. cfgcmd:: set service conntrack-sync enable-startup-resync +.. cfgcmd:: set service conntrack-sync startup-resync Order conntrackd to request a complete conntrack table resync against the other node at startup. ->>>>>>> f4e6d33a (conntrack-sync: T1244: Support for StartupResync in conntrackd) ********* Operation ********* |