Merge pull request #1121 from electrical/update_es_jruby

Update ES and jruby
This commit is contained in:
Richard Pijnenburg 2014-02-25 20:06:38 +00:00
commit e91dac1444
2 changed files with 4 additions and 4 deletions

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

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: