summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge-3.cfg
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-06-30 10:48:21 +0200
committerMagnus Ahltorp <map@kth.se>2017-06-30 10:48:21 +0200
commit041cc10562cb1ecfd8b9c90b7c6da7fa860a237d (patch)
tree05ef4ec42b30c1a60abc580e7d638f2b4a8846b3 /test/catlfish-test-local-merge-3.cfg
parent55e1c7b770b75a9baaf3fb39ef4cb5c663381b01 (diff)
Replace 'localnodes' config with 'nodename'
Also some cleanup
Diffstat (limited to 'test/catlfish-test-local-merge-3.cfg')
-rw-r--r--test/catlfish-test-local-merge-3.cfg8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/catlfish-test-local-merge-3.cfg b/test/catlfish-test-local-merge-3.cfg
index f6da89e..8c4b4c6 100644
--- a/test/catlfish-test-local-merge-3.cfg
+++ b/test/catlfish-test-local-merge-3.cfg
@@ -1,11 +1,7 @@
-localnodes:
- - merge-3
-
-addresses:
- merge-3: 127.0.0.1:8183
-
nodename: merge-3
+mergeaddress: 127.0.0.1:8183
+
paths:
configdir: .
knownroots: known_roots