Fixed conf files for tests

8 years ago · 432919b3ae
parent f1e1883609
commit 432919b3ae
2 changed files with 2 additions and 2 deletions
--- a/dev/tests/conf-local/local.conf
+++ b/dev/tests/conf-local/local.conf
@ -122,7 +122,7 @@ MAX_WAIT=7200
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
 ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.
-CONFLICT_BACKUP_MULTIPLE=yes
+CONFLICT_BACKUP_MULTIPLE=no
 ## Osync will clean backup files after a given number of days. Setting this to 0 will disable cleaning and keep backups forever. Warning: This can be very space consuming.
 CONFLICT_BACKUP_DAYS=30
 ## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica.
--- a/dev/tests/conf-local/remote.conf
+++ b/dev/tests/conf-local/remote.conf
@ -122,7 +122,7 @@ MAX_WAIT=7200
 ## Enabling this option will keep a backup of a file on the target replica if it gets updated from the source replica. Backups will be made to .osync_workdir/backups
 CONFLICT_BACKUP=yes
 ## Keep multiple backup versions of the same file. Warning, This can be very space consuming.
-CONFLICT_BACKUP_MULTIPLE=yes
+CONFLICT_BACKUP_MULTIPLE=no
 ## Osync will clean backup files after a given number of days. Setting this to 0 will disable cleaning and keep backups forever. Warning: This can be very space consuming.
 CONFLICT_BACKUP_DAYS=30
 ## If the same file exists on both replicas, newer version will be synced. However, if both files have the same timestamp but differ, CONFILCT_PREVALANCE sets winner replica.