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
committerLinus Nordberg <linus@nordu.net>2017-07-06 17:48:30 +0200
commit4e44c1e8a4ea6ec4c5eeb2a1a05d93e076c7fd50 (patch)
treed4a6945f3399324e4db99673449c425ebd9e3c78 /test/catlfish-test-local-merge-3.cfg
parentbb71cbabaac8baf18f7a685339f0e2670b019d91 (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