diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:35:44 +0200 |
| commit | c2f8d1a44defeadefcda560ba8a3883e25e24831 (patch) | |
| tree | 1eead2a9118b556932ca10e398d8d94f510b70ac /.gitignore | |
| parent | a88aa2e1a16e1ac1af1fa3b19cb2b88c7783af37 (diff) | |
| parent | 9324923d31d389110e2ab882a035982e2b269417 (diff) | |
| download | vyatta-op-vpn-lithium.tar.gz vyatta-op-vpn-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
lib/OPMode.pm
scripts/vyatta-show-ipsec-status.pl
templates/show/vpn/ipsec/sa/node.def
templates/show/vpn/ipsec/sa/peer/node.def
templates/show/vpn/ipsec/status/node.def
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 24 |
1 files changed, 24 insertions, 0 deletions
@@ -1,4 +1,6 @@ *~ +m4/lt*.m4 +m4/libtool.m4 .*.swp *.[oa] *.l[oa] @@ -26,3 +28,25 @@ libtool /Makefile /command_proc_show_vpn +templates/generate/vpn/rsa-key/bits/node.tag/node.def +templates/generate/vpn/rsa-key/bits/node.tag/random/node.tag/node.def +templates/generate/vpn/rsa-key/node.def +templates/generate/vpn/x509/key-pair/node.tag/node.def +templates/reset/vpn/ipsec-peer/node.tag/node.def +templates/reset/vpn/ipsec-peer/node.tag/tunnel/node.tag/node.def +templates/reset/vpn/ipsec-peer/node.tag/vti/node.def +templates/reset/vpn/ipsec-profile/node.tag/node.def +templates/reset/vpn/ipsec-profile/node.tag/tunnel/node.tag/node.def +templates/restart/vpn/node.def +templates/show/vpn/debug/detail/node.def +templates/show/vpn/debug/node.def +templates/show/vpn/debug/peer/node.tag/node.def +templates/show/vpn/debug/peer/node.tag/tunnel/node.tag/node.def +templates/show/vpn/ike/rsa-keys/node.def +templates/show/vpn/ike/sa/nat-traversal/node.def +templates/show/vpn/ike/sa/node.def +templates/show/vpn/ike/sa/peer/node.tag/node.def +templates/show/vpn/ike/secrets/node.def +templates/show/vpn/ike/status/node.def +templates/show/vpn/ipsec/status/node.def +/scripts/vyatta-gen-x509-keypair |