Merge branch 'master' of github.com:logstash/logstash

CHANGELOG

@@ -1,3 +1,8 @@
+1.0.11 (???)
+  - Fix bug in grep filter that would drop/cancel events if you had more
+    than one event type flowing through filters and didn't have a grep
+    filter defined for each type.
+
 1.0.10 (May 23, 2011)
   - Fix tcp input bug (LOGSTASH-88) that would drop connections.
   - Grok patterns_dir (filter config) and --grok-patterns-dir (cmdline opt)

lib/logstash/filters/grep.rb

@@ -42,7 +42,6 @@ class LogStash::Filters::Grep < LogStash::Filters::Base
   def filter(event)
     if event.type != @type
       @logger.debug("grep: skipping type #{event.type} from #{event.source}")
-      event.cancel
       return
     end