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

fixed broken merge

Browse source
This commit is contained in:
Nikolay Bryskin 2013-08-17 14:45:59 +04:00
parent 58d2433628
commit c33bed87d0
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash.gemspec
View file

@ -69,13 +69,9 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "varnish-rb" #(MIT license) gem.add_runtime_dependency "varnish-rb" #(MIT license)
gem.add_runtime_dependency "mail" #(MIT license) gem.add_runtime_dependency "mail" #(MIT license)
gem.add_runtime_dependency "rbnacl" #(MIT license) gem.add_runtime_dependency "rbnacl" #(MIT license)
<<<<<<< HEAD
gem.add_runtime_dependency "sequel" #(MIT license) gem.add_runtime_dependency "sequel" #(MIT license)
gem.add_runtime_dependency "jdbc-sqlite3" #(MIT license) gem.add_runtime_dependency "jdbc-sqlite3" #(MIT license)
gem.add_runtime_dependency "bindata" #(ruby license)
=======
gem.add_runtime_dependency "bindata", [">= 1.5.0"] #(ruby license) gem.add_runtime_dependency "bindata", [">= 1.5.0"] #(ruby license)
>>>>>>> Require at least BinData 1.5.0 for needed functionality.
if RUBY_PLATFORM == 'java' if RUBY_PLATFORM == 'java'
gem.platform = RUBY_PLATFORM gem.platform = RUBY_PLATFORM