Merge remote-tracking branch 'remotes/logstash/master'

This commit is contained in:
Louis Zuckerman 2012-12-28 14:24:49 -05:00
commit e185463416
5 changed files with 5 additions and 5 deletions

View file

@ -1,6 +1,6 @@
require "logstash/filters/base"
require "logstash/namespace"
require "logstash/time"
require "logstash/time_addon"
# The date filter is used for parsing dates from fields and using that
# date or timestamp as the timestamp for the event.

View file

@ -1,6 +1,6 @@
require "logstash/filters/base"
require "logstash/namespace"
require "logstash/time"
require "logstash/time_addon"
# The mutate filter allows you to do general mutations to fields. You
# can rename, remove, replace, and modify fields in your events.

View file

@ -1,6 +1,6 @@
require "logstash/filters/base"
require "logstash/namespace"
require "logstash/time"
require "logstash/time_addon"
# The split filter is for splitting multiline messages into separate events.
#

View file

@ -1,7 +1,7 @@
require "date"
require "logstash/inputs/base"
require "logstash/namespace"
require "logstash/time" # should really use the filters/date.rb bits
require "logstash/time_addon" # should really use the filters/date.rb bits
require "socket"
# Read gelf messages as events over the network.

View file

@ -1,7 +1,7 @@
require "date"
require "logstash/inputs/base"
require "logstash/namespace"
require "logstash/time" # should really use the filters/date.rb bits
require "logstash/time_addon" # should really use the filters/date.rb bits
require "socket"
# Read messages as events over the network via udp.