Allow limiting max conflicts (fixes #2282)

2015-10-13 20:50:58 +01:00
parent 2b56961b54
commit 752533489a
6 changed files with 66 additions and 33 deletions
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -100,6 +100,7 @@ func TestDeviceConfig(t *testing.T) {
 				Hashers:         0,
 				AutoNormalize:   true,
 				MinDiskFreePct:  1,
+				MaxConflicts:    -1,
 			},
 		}
 		expectedDevices := []DeviceConfiguration{