diff options
author | Christian Poessinger <christian@poessinger.com> | 2019-11-02 17:16:46 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2019-11-02 17:16:46 +0100 |
commit | 37dcd23368de5872a5d56d356d29cafb1b185ce5 (patch) | |
tree | 2b2aedb3a5b27fca32d21bf07516e7e284e1f147 /src/conf_mode/dns_forwarding.py | |
parent | cd6fc1182e649a72e842567d9aaa6dd39f304e2a (diff) | |
parent | 99c762ebbbb30a638760627bc6d5fd86932951e1 (diff) | |
download | vyos-1x-37dcd23368de5872a5d56d356d29cafb1b185ce5.tar.gz vyos-1x-37dcd23368de5872a5d56d356d29cafb1b185ce5.zip |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
bonding: T1777: change priority to be after ethernet interfaces
bridge: T1783: bugfix removal of member interface
Diffstat (limited to 'src/conf_mode/dns_forwarding.py')
0 files changed, 0 insertions, 0 deletions