diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-03-25 11:00:21 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-03-25 11:00:21 +0100 |
| commit | 54e0457f1e4c4376bdecc891a2d5ae423eb2266d (patch) | |
| tree | 8a756b221ded2625f186ff15b150a99365abe067 /test/catlfish-test-local-merge.cfg | |
| parent | f5ee5ed3e1b445c52efd7978357adf5552643fd4 (diff) | |
| parent | 842b07ef461483fcc297cc56e128918ddd273932 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/compileconfig2'
Conflicts:
.gitignore
Diffstat (limited to 'test/catlfish-test-local-merge.cfg')
| -rw-r--r-- | test/catlfish-test-local-merge.cfg | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg new file mode 100644 index 0000000..b7f5009 --- /dev/null +++ b/test/catlfish-test-local-merge.cfg @@ -0,0 +1,8 @@ +nodename: merge-1 + +paths: + mergedb: ../rel/mergedb + https_cacertfile: catlfish/webroot/certs/webcert.pem + publickeys: publickeys + logpublickey: test/eckey-public.pem + privatekeys: privatekeys |