Permalink
Browse files

Merge branch 'hotfix/1.14.6' into stable

  • Loading branch information...
2 parents 7195988 + fbc9208 commit 59621bfe8881291e0844a5e18be21ef840cfe218 @mpapis mpapis committed Jul 18, 2012
Showing with 2 additions and 7 deletions.
  1. +1 −1 VERSION
  2. +1 −1 gemsets/jruby/global.gems
  3. +0 −5 scripts/functions/manage/jruby
View
@@ -1 +1 @@
-1.14.5
+1.14.6
@@ -1,6 +1,6 @@
+rake
jruby-openssl
jruby-launcher
bundler
rubygems-bundler
-rake
rvm
@@ -114,9 +114,4 @@ jruby_install()
rvm_log "Copying across included gems"
cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$rvm_ruby_gem_home/"
fi
-
- (
- export JRUBY_OPTS="--1.8"
- "$rvm_ruby_home/bin/gem" install jruby-launcher
- )
}

0 comments on commit 59621bf

Please sign in to comment.