Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.8
JumpMind · Jul 3, 2017 · dd240e5 · dd240e5
2 parents a6f234a + f1468de
commit dd240e5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/symmetric-core/src/main/resources/symmetric-default.properties b/symmetric-core/src/main/resources/symmetric-default.properties
@@ -422,6 +422,7 @@ auto.sync.triggers.at.startup=true
 # If this is true, then check if configuration should be pulled from registration server at startup.
 # If the config version in the database does not match the software version, it will pull config.
 #
+# DatabaseOverridable: true
 # Tags: general
 # Type: boolean
 auto.sync.config.at.startup=true
@@ -435,6 +436,7 @@ auto.sync.config.after.upgrade=true
 
 # Capture and send SymmetricDS configuration changes to client nodes.
 #
+# DatabaseOverridable: true
 # Tags: general
 # Type: boolean
 auto.sync.configuration=true
@@ -886,6 +888,7 @@ start.synctriggers.job=true
 # This job checks that the configuration version matches the software version, otherwise it
 # will pull the latest configuration from the registration server.
 #
+# DatabaseOverridable: true
 # Tags: jobs
 # Type: boolean
 start.sync.config.job=true