debian/changelog | 8 ++++++++ scripts/vpn-config.pl | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 4 deletions(-)
New commits: commit 53f9b4f72acbae5b55873dcc9cf3647173ff32f5 Author: John Southworth <[email protected]> Date: Thu Jan 20 19:41:18 2011 -0600 0.12.47 commit 974895246d4163c04d701648f544cb63f64c2d8e Author: John Southworth <[email protected]> Date: Thu Jan 20 18:01:50 2011 -0600 make adjustment so that op mode can deal with new secrets file format (cherry picked from commit ef7acbaef8ccd9305644f22ddb6df1ca985fcf4a) commit 99083911dd340dcbcfa6215420ff4913696a9043 Author: John Southworth <[email protected]> Date: Thu Jan 20 19:31:02 2011 -0600 fix conflict while merging http://suva.vyatta.com/git/?p=vyatta-cfg-vpn.git;a=commitdiff;h=53f9b4f72acbae5b55873dcc9cf3647173ff32f5 http://suva.vyatta.com/git/?p=vyatta-cfg-vpn.git;a=commitdiff;h=974895246d4163c04d701648f544cb63f64c2d8e http://suva.vyatta.com/git/?p=vyatta-cfg-vpn.git;a=commitdiff;h=99083911dd340dcbcfa6215420ff4913696a9043 _______________________________________________ svn mailing list [email protected] http://mailman.vyatta.com/mailman/listinfo/svn
