summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorNataliia Solomko <natalirs1985@gmail.com>2024-04-05 22:15:20 +0300
committerChristian Breunig <christian@breunig.cc>2024-04-07 16:24:47 +0200
commitd2a3af453ebacc395c4087aacddad1820fe0d513 (patch)
tree9cdec46806cad20a893396e1155ab76f075dfae4 /docs
parentdd9c1a052fb7e3877b6aa34f40be0b9980db2023 (diff)
downloadvyos-documentation-d2a3af453ebacc395c4087aacddad1820fe0d513.tar.gz
vyos-documentation-d2a3af453ebacc395c4087aacddad1820fe0d513.zip
conntrack-sync: T1244: Support for StartupResync in conntrackd
(cherry picked from commit 2b32a2e134ec4dcb1a574fd405147aeb9644abdb)
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/service/conntrack-sync.rst5
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
*********