Merge remote-tracking branch 'upstream/master'

Conflicts: CHANGELOG.md lib/language_pack/version.rb
cloudfoundry · Sep 22, 2014 · e8ce7db · e8ce7db
2 parents 609701e + c388f12
commit e8ce7db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/language_pack/ruby.rb b/lib/language_pack/ruby.rb
@@ -42,7 +42,7 @@ def initialize(build_path, cache_path=nil)
     super(build_path, cache_path)
     @fetchers[:mri]    = LanguagePack::Fetcher.new(VENDOR_URL, @stack)
     @fetchers[:jvm]    = LanguagePack::Fetcher.new(JVM_BASE_URL)
-    @fetchers[:rbx]    = LanguagePack::Fetcher.new(RBX_BASE_URL)
+    @fetchers[:rbx]    = LanguagePack::Fetcher.new(RBX_BASE_URL, @stack)
     @node_installer    = LanguagePack::NodeInstaller.new(@stack)
   end
 

diff --git a/lib/language_pack/version.rb b/lib/language_pack/version.rb
@@ -5,6 +5,6 @@ module LanguagePack
   class LanguagePack::Base
     VERSION_FILE = File.expand_path('../../../VERSION', __FILE__)
     CF_BUILDPACK_VERSION = File.readlines(VERSION_FILE).first.chomp
-    BUILDPACK_VERSION = "v126"
+    BUILDPACK_VERSION = "v127"
   end
 end