From: Josh <jrosenba@cisco.com>
Date: Wed, 7 Jan 2015 19:41:15 +0000 (-0600)
Subject: Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs... 
X-Git-Tag: 3.0.0-233~1089^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e634776c3449870ca9e98bd2ea2cf49530570ff1;p=thirdparty%2Fsnort3.git

Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/jrosenba/codecs into codecs

Conflicts:
	tools/snort2lua/rule_states/rule_content.cc
---

e634776c3449870ca9e98bd2ea2cf49530570ff1
diff --cc tools/snort2lua/rule_states/rule_content.cc
index 9a2de3fd2,22539cab5..fda20612b
--- a/tools/snort2lua/rule_states/rule_content.cc
+++ b/tools/snort2lua/rule_states/rule_content.cc
@@@ -128,17 -128,15 +128,16 @@@ bool Content<option_name>::parse_option
      else if (!keyword.compare("fast_pattern"))
      {
          if (val.empty())
 +        {
               rule_api.add_suboption("fast_pattern");
-         }
-         else if(!val.compare("only"))
 -
++		}
+         else if (!val.compare("only"))
          {
 -            static bool printed = false;
 -            if (!printed)
 +            static bool not_printed = true;
- 
-             if (not_printed)
++            if ( not_printed )
              {
 -                printed = true;
                  rule_api.add_comment("content's 'only' option has been deleted");
 +                not_printed = false;
              }
          }
          else