diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:54:03 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-23 20:54:03 +0100 |
| commit | edc842a53f07939884469178fa90e0915e982c53 (patch) | |
| tree | ea71854a8124089243a57e1c30cdf6069d7d36da | |
| parent | e5dd89234f870c0c5146f9326b852090bc9aa6f3 (diff) | |
| parent | 06b1a84934c447680e4146346283b967f7b9dc2d (diff) | |
| download | vyatta-cfg-system-edc842a53f07939884469178fa90e0915e982c53.tar.gz vyatta-cfg-system-edc842a53f07939884469178fa90e0915e982c53.zip | |
Merge branch 'current' into equuleus
* current:
wireless: T1627: initial rewrite in XML/Python style
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/interfaces@4 (renamed from cfg-version/interfaces@3) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 6bf02e7e..86585b16 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,7 @@ curver_DATA += cfg-version/l2tp@1 curver_DATA += cfg-version/pptp@1 curver_DATA += cfg-version/ntp@1 curver_DATA += cfg-version/webproxy@2 -curver_DATA += cfg-version/interfaces@3 +curver_DATA += cfg-version/interfaces@4 curver_DATA += cfg-version/dns-forwarding@2 curver_DATA += cfg-version/vyos-accel-ppp@2 curver_DATA += cfg-version/snmp@1 diff --git a/cfg-version/interfaces@3 b/cfg-version/interfaces@4 index e69de29b..e69de29b 100644 --- a/cfg-version/interfaces@3 +++ b/cfg-version/interfaces@4 |