diff options
| author | Michael Biebl <biebl@debian.org> | 2014-07-06 03:04:17 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-07-06 03:04:17 +0200 |
| commit | 3ce667b6ee6b86291bbe60ef93cba7f11a5c5400 (patch) | |
| tree | af3daa7221e898b72f3de26eb2cf0c1b1c8661b0 /src/config/tests/conf.d | |
| parent | f02d31d95af29678092d1ff01f714621bc9dcc0f (diff) | |
| parent | 33491bc4279481db8ae47213e34a6d695a0e8830 (diff) | |
Merge tag 'upstream/0.9.10.0'
Upstream version 0.9.10.0
Diffstat (limited to 'src/config/tests/conf.d')
| -rw-r--r-- | src/config/tests/conf.d/00-overrides.conf | 11 | ||||
| -rw-r--r-- | src/config/tests/conf.d/10-more.conf | 11 | ||||
| -rw-r--r-- | src/config/tests/conf.d/90-last.conf | 5 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/config/tests/conf.d/00-overrides.conf b/src/config/tests/conf.d/00-overrides.conf new file mode 100644 index 00000000..0aa19d48 --- /dev/null +++ b/src/config/tests/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/config/tests/conf.d/10-more.conf b/src/config/tests/conf.d/10-more.conf new file mode 100644 index 00000000..b1424a4b --- /dev/null +++ b/src/config/tests/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/config/tests/conf.d/90-last.conf b/src/config/tests/conf.d/90-last.conf new file mode 100644 index 00000000..dc1de394 --- /dev/null +++ b/src/config/tests/conf.d/90-last.conf @@ -0,0 +1,5 @@ +[main] +plugins+=one,two + +[order] +a=90 |