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

Merge remote-tracking branch 'upstream/pull/1121' into 1.4.x

Browse source
This commit is contained in:
Jordan Sissel 2014-02-25 13:15:14 -08:00
commit 9caf61f82c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -2,8 +2,8 @@
# rsync
# wget or curl
#
JRUBY_VERSION=1.7.10
ELASTICSEARCH_VERSION=1.0.0
JRUBY_VERSION=1.7.11
ELASTICSEARCH_VERSION=1.0.1
WITH_JRUBY=java -jar $(shell pwd)/$(JRUBY) -S
JRUBY=vendor/jar/jruby-complete-$(JRUBY_VERSION).jar

4
README.md
View file

@ -26,8 +26,8 @@ If you don't have JRuby already (or don't use rvm, rbenv, etc), you can have `bi
Otherwise, here's how to get started with rvm:
# Install JRuby with rvm
rvm install jruby-1.7.8
rvm use jruby-1.7.8
rvm install jruby-1.7.11
rvm use jruby-1.7.11
Now install dependencies: