github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1165 from jordansissel/web-fixes

Browse source 
Add sinatra gem. This was accidentally removed in a previous commit.
This commit is contained in:
Jordan Sissel 2014-03-12 14:53:47 -07:00
commit 96cd3bc424
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
logstash.gemspec
View file

@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "ftw", ["~> 0.0.39"] #(Apache 2.0 license) gem.add_runtime_dependency "ftw", ["~> 0.0.39"] #(Apache 2.0 license)
gem.add_runtime_dependency "mime-types" #(GPL 2.0) gem.add_runtime_dependency "mime-types" #(GPL 2.0)
gem.add_runtime_dependency "rack" # (MIT-style license) gem.add_runtime_dependency "rack" # (MIT-style license)
gem.add_runtime_dependency "sinatra" # (MIT-style license)
# Input/Output/Filter dependencies # Input/Output/Filter dependencies
#TODO Can these be optional? #TODO Can these be optional?

8
tools/Gemfile.jruby-1.9.lock
View file

@ -115,6 +115,8 @@ GEM
slop (~> 3.4) slop (~> 3.4)
spoon (~> 0.0) spoon (~> 0.0)
rack (1.5.2) rack (1.5.2)
rack-protection (1.5.2)
rack
rbnacl (2.0.0) rbnacl (2.0.0)
ffi ffi
redis (3.0.7) redis (3.0.7)
@ -144,6 +146,10 @@ GEM
multi_json multi_json
simplecov-html (~> 0.8.0) simplecov-html (~> 0.8.0)
simplecov-html (0.8.0) simplecov-html (0.8.0)
sinatra (1.4.4)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (~> 1.3, >= 1.3.4)
slop (3.4.7) slop (3.4.7)
snmp (1.1.1) snmp (1.1.1)
spoon (0.0.4) spoon (0.0.4)
@ -159,6 +165,7 @@ GEM
atomic (>= 1.1.7, < 2) atomic (>= 1.1.7, < 2)
thread_safe (0.2.0-java) thread_safe (0.2.0-java)
atomic (>= 1.1.7, < 2) atomic (>= 1.1.7, < 2)
tilt (1.4.1)
tins (1.0.0) tins (1.0.0)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
@ -226,6 +233,7 @@ DEPENDENCIES
rufus-scheduler (~> 2.0.24) rufus-scheduler (~> 2.0.24)
rumbster rumbster
shoulda shoulda
sinatra
snmp snmp
spoon spoon
statsd-ruby (= 1.2.0) statsd-ruby (= 1.2.0)