github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

bad merge

Browse source 
Fixes #6109
This commit is contained in:
Pier-Hugues Pellerin 2016-11-10 09:31:38 -05:00
parent 84a747cdfe
commit 21c435a5b3
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
logstash-core/lib/logstash/agent.rb
View file

@ -22,7 +22,7 @@ class LogStash::Agent
include LogStash::Util::Loggable include LogStash::Util::Loggable
STARTED_AT = Time.now.freeze STARTED_AT = Time.now.freeze
attr_reader :metric, :name, :pipelines, :settings, :webserver attr_reader :metric, :name, :pipelines, :settings, :webserver, :dispatcher
attr_accessor :logger attr_accessor :logger
# initialize method for LogStash::Agent # initialize method for LogStash::Agent