diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-11 20:14:43 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-11 20:14:43 +0100 |
| commit | e5dd89234f870c0c5146f9326b852090bc9aa6f3 (patch) | |
| tree | 09f8ce77c40a1f3a1b58d7b2dae0dc620adf95d3 | |
| parent | 81640590f9bed7b9e299057571febd2b21e8124f (diff) | |
| parent | dc7250df34bb0176aaaeaade80783944619fa19a (diff) | |
| download | vyatta-cfg-system-e5dd89234f870c0c5146f9326b852090bc9aa6f3.tar.gz vyatta-cfg-system-e5dd89234f870c0c5146f9326b852090bc9aa6f3.zip | |
Merge branch 'current' of github.com:vyos/vyatta-cfg-system into equuleus
* 'current' of github.com:vyos/vyatta-cfg-system:
[Interface, OpenVPN]: T1704: New interface version 3, because of OpenVPN config syntax change
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cfg-version/interfaces@3 (renamed from cfg-version/interfaces@2) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 8ca48028..6bf02e7e 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@2 +curver_DATA += cfg-version/interfaces@3 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@2 b/cfg-version/interfaces@3 index e69de29b..e69de29b 100644 --- a/cfg-version/interfaces@2 +++ b/cfg-version/interfaces@3 |