diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
| commit | 4d939c60d4ac257a2977871baf3b8b3671b5a4f7 (patch) | |
| tree | 318c08dea542d7865422af76e2d36a9559340cd3 /src/tests/config/conf.d | |
| parent | bb9eef75b2aaaab741e2b99911c8be3db6d1bc0b (diff) | |
| parent | 2c032d8f1c6292c1338a615e6ec40252889ba85c (diff) | |
Merge tag 'upstream/1.0.0' into experimental
Upstream version 1.0.0
Diffstat (limited to 'src/tests/config/conf.d')
| -rw-r--r-- | src/tests/config/conf.d/00-overrides.conf | 11 | ||||
| -rw-r--r-- | src/tests/config/conf.d/10-more.conf | 11 | ||||
| -rw-r--r-- | src/tests/config/conf.d/90-last.conf | 5 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/tests/config/conf.d/00-overrides.conf b/src/tests/config/conf.d/00-overrides.conf new file mode 100644 index 00000000..0aa19d48 --- /dev/null +++ b/src/tests/config/conf.d/00-overrides.conf @@ -0,0 +1,11 @@ +[main] +dhcp=dhcpcd + +[logging] +domains=PLATFORM,DNS,WIFI + +[order] +a=0 +b=0 +c=0 + diff --git a/src/tests/config/conf.d/10-more.conf b/src/tests/config/conf.d/10-more.conf new file mode 100644 index 00000000..b1424a4b --- /dev/null +++ b/src/tests/config/conf.d/10-more.conf @@ -0,0 +1,11 @@ +[main] +extra=hello +new+=something + +[connectivity] +uri=http://example.net + +[order] +a=10 +b=10 + diff --git a/src/tests/config/conf.d/90-last.conf b/src/tests/config/conf.d/90-last.conf new file mode 100644 index 00000000..dc1de394 --- /dev/null +++ b/src/tests/config/conf.d/90-last.conf @@ -0,0 +1,5 @@ +[main] +plugins+=one,two + +[order] +a=90 |