Merge pull request #2381 from AudriusButkevicius/maxcon

Allow limiting max conflicts (fixes #2282)
2015-10-17 09:10:31 +09:00
parent 4ddb066728 752533489a
commit 910a7c619a
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{