diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-12-04 17:13:59 +0100 |
| commit | a96ffc33cc63918ba3815f66c506c717a8676621 (patch) | |
| tree | f883f5976a40f2066f500363931a5e499374b8de /src/conf_mode | |
| parent | 26677aa3ce312a5b980ea88d57feebd09e39fd98 (diff) | |
| parent | aceb4d7e187a571019e4bc24cd23efc7c2f624fe (diff) | |
| download | vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.tar.gz vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.zip | |
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x:
shutdown: T1826: Modify cancel reboot msg
T1801: move escaping of backslashes into configtree
vxlan: T1636: remove unused import statements
geneve: T1799: remove unused import statements
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/interfaces-geneve.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-vxlan.py | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/conf_mode/interfaces-geneve.py b/src/conf_mode/interfaces-geneve.py index ba684b553..7322e0c50 100755 --- a/src/conf_mode/interfaces-geneve.py +++ b/src/conf_mode/interfaces-geneve.py @@ -19,10 +19,8 @@ import os from sys import exit from copy import deepcopy -from vyos.configdict import list_diff from vyos.config import Config from vyos.ifconfig import GeneveIf, Interface -from vyos.interfaces import get_type_of_interface from vyos import ConfigError from netifaces import interfaces diff --git a/src/conf_mode/interfaces-vxlan.py b/src/conf_mode/interfaces-vxlan.py index 30ff1755d..c1fedc824 100755 --- a/src/conf_mode/interfaces-vxlan.py +++ b/src/conf_mode/interfaces-vxlan.py @@ -19,10 +19,8 @@ import os from sys import exit from copy import deepcopy -from vyos.configdict import list_diff from vyos.config import Config from vyos.ifconfig import VXLANIf, Interface -from vyos.interfaces import get_type_of_interface from vyos import ConfigError from netifaces import interfaces |