diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-02-07 15:59:26 -0600 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-02-07 15:59:26 -0600 |
| commit | f36f94dba198a982c4df0fd17d94e870b5740615 (patch) | |
| tree | 48a7b69e09d9836f54ea09cf4f4b086927150111 | |
| parent | 792342e864a70bd162af3a00837bab0c0d3b49b0 (diff) | |
| parent | eb2d4630d077a50eaf244cb7ef693d3ce2fc8059 (diff) | |
| download | vyatta-cfg-vpn-f36f94dba198a982c4df0fd17d94e870b5740615.tar.gz vyatta-cfg-vpn-f36f94dba198a982c4df0fd17d94e870b5740615.zip | |
Merge branch 'napa' of git.vyatta.com:/git/vyatta-cfg-vpn into napa
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 36fb4e9..a9ca91a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ sbin_SCRIPTS += scripts/vyatta-vpn-ppp-updown.pl share_perl5_DATA = lib/Vyatta/VPN/Util.pm -curver_DATA = cfg-version/ipsec@2 +curver_DATA = cfg-version/ipsec@3 cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/debian/changelog b/debian/changelog index 30004ac..422a90c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-vpn (0.12.62) unstable; urgency=low + + * change ipsec config version in Makefile as well + + -- Mohit Mehta <mohit@vyatta.com> Fri, 04 Feb 2011 18:34:18 -0800 + vyatta-cfg-vpn (0.12.61) unstable; urgency=low * change ipsec config version |