From 0c86955013f27759c84e3e7bca507e4c8dcc6f88 Mon Sep 17 00:00:00 2001
From: Nataliia Solomko <natalirs1985@gmail.com>
Date: Fri, 5 Apr 2024 14:33:25 +0300
Subject: conntrack-sync: T1244: Support for StartupResync in conntrackd

(cherry picked from commit f4e6d33a06e6125419900723ae7dc02fe264059d)

# Conflicts:
#	docs/configuration/service/conntrack-sync.rst
---
 docs/configuration/service/conntrack-sync.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'docs/configuration')

diff --git a/docs/configuration/service/conntrack-sync.rst b/docs/configuration/service/conntrack-sync.rst
index c95cadc9..ccaaefff 100644
--- a/docs/configuration/service/conntrack-sync.rst
+++ b/docs/configuration/service/conntrack-sync.rst
@@ -98,6 +98,18 @@ 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
+
+   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
 *********
-- 
cgit v1.2.3