diff options
author | Deepti Kulkarni <deepti@vyatta.com> | 2011-12-16 04:19:02 -0800 |
---|---|---|
committer | Deepti Kulkarni <deepti@vyatta.com> | 2011-12-16 04:19:02 -0800 |
commit | bad26964038fbe9d8b904e500c9fc3f90a70a005 (patch) | |
tree | a0ca4f3c4a1b26789b4752228dbb9d97c2949ff7 /lib | |
parent | f0f5874e15f2095bb2935d1b3bf92d321dc7c33f (diff) | |
download | vyatta-conntrack-bad26964038fbe9d8b904e500c9fc3f90a70a005.tar.gz vyatta-conntrack-bad26964038fbe9d8b904e500c9fc3f90a70a005.zip |
Resolved merge errors from Makefile.
Moved ConntrackUtil.pm to Conntrack dir.
Bug fix for 7676 for conntrack logging.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Vyatta/Conntrack/ConntrackUtil.pm (renamed from lib/Vyatta/ConntrackUtil.pm) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Vyatta/ConntrackUtil.pm b/lib/Vyatta/Conntrack/ConntrackUtil.pm index b290486..8f529c2 100644 --- a/lib/Vyatta/ConntrackUtil.pm +++ b/lib/Vyatta/Conntrack/ConntrackUtil.pm @@ -23,7 +23,7 @@ # **** End License **** # -package Vyatta::ConntrackUtil; +package Vyatta::Conntrack::ConntrackUtil; use base qw(Exporter); our @EXPORT = qw(check_for_conntrack_hooks); |