diff options
| author | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-05-05 17:49:11 +0200 |
| commit | e847e3cc3e4eded45a358bf838e1edcf4c12fcb5 (patch) | |
| tree | 9db16e390931b9b800a174c7117b9297b351283f /src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main | |
| parent | 1cd35b49de89f65c386ae2ff98a8e08342c080b0 (diff) | |
| parent | f408e27bccfacf347605a8d98649975a68f38a17 (diff) | |
Merge tag 'upstream/1.0.2'
Upstream version 1.0.2
Diffstat (limited to 'src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main')
| -rw-r--r-- | src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main index 7fbbfe22..3b9fcb28 100644 --- a/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main +++ b/src/settings/plugins/keyfile/tests/keyfiles/Test_Bridge_Main @@ -6,7 +6,7 @@ type=bridge [bridge] interface-name=br0 stp=true -forward-delay=0 +forward-delay=2 priority=32744 hello-time=7 max-age=39 |