diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
| commit | 863ef44a16759501c7ce939e93bf2891a552b2e3 (patch) | |
| tree | 0fc28971759e60a044425d6d3f45ccfb596ed2e0 /test/catlfish-test-local-merge-2.cfg | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
| parent | a08cb72fa60bdb11873a2409c3b5aa8ff2b4667d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/refactor-tests'
Diffstat (limited to 'test/catlfish-test-local-merge-2.cfg')
| -rw-r--r-- | test/catlfish-test-local-merge-2.cfg | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg index e2baa01..d42cbf3 100644 --- a/test/catlfish-test-local-merge-2.cfg +++ b/test/catlfish-test-local-merge-2.cfg @@ -2,7 +2,7 @@ localnodes: - merge-2 addresses: - merge-2: 127.0.0.1:8181 + merge-2: 127.0.0.1:8182 nodename: merge-2 @@ -11,16 +11,26 @@ nodename: merge-2 paths: configdir: . knownroots: known_roots - mergedb: mergedb-secondary + mergedb: machine/merge-2/db https_certfile: httpscert/httpscert-1.pem https_keyfile: httpscert/httpskey-1.pem https_cacertfile: httpsca/demoCA/cacert.pem publickeys: publickeys logpublickey: keys/logkey.pem privatekeys: privatekeys + verifycert_bin: ../bin/verifycert.erl.escript logadminkey: MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQ Ah9sZ2CD+JeLbprS6AFcZbo0TGCH0rtEnr2Q3JW0ylhfA+ 0/WLu755b3soVX/wI23vqCVGC7N9fOB2WUltveQ== +merge: + min-delay: 1 + backup-window-size: 2 + backup-sendlog-chunksize: 1 + backup-sendentries-chunksize: 1 + dist-window-size: 2 + dist-sendlog-chunksize: 1 + dist-sendentries-chunksize: 1 + configurl: file:///CURRENTWORKINGDIRECTORY/catlfish-test-generated.cfg |