summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-12-31 14:31:47 +0100
committerDaniil Baturin <daniil@baturin.org>2018-12-31 14:31:47 +0100
commit1539c1c882a70436659966594b1d7aeedc487a43 (patch)
treec26aff5de39b255edda0efebc5eee825f0837d25
parent865f01ca6e264f259415a04aacc53d38b2d5c350 (diff)
parentc1008389a525994feebfb059d1e7bedb785e2804 (diff)
downloadvyatta-cfg-system-1539c1c882a70436659966594b1d7aeedc487a43.tar.gz
vyatta-cfg-system-1539c1c882a70436659966594b1d7aeedc487a43.zip
Merge branch 'current' into crux
-rw-r--r--Makefile.am1
-rw-r--r--cfg-version/webproxy@20
2 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ccf5fe83..ce970826 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -125,6 +125,7 @@ curver_DATA += cfg-version/ssh@1
curver_DATA += cfg-version/l2tp@1
curver_DATA += cfg-version/pptp@1
curver_DATA += cfg-version/ntp@1
+curver_DATA += cfg-version/webproxy@2
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
diff --git a/cfg-version/webproxy@2 b/cfg-version/webproxy@2
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/cfg-version/webproxy@2