Merge branch 'master' into truffle-head

# Conflicts: # .travis.yml
jruby · Dec 27, 2015 · 2fbe3a0 · 2fbe3a0
2 parents 90646d8 + e5133ba
commit 2fbe3a0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/truffle/attachments-optimise.rb b/test/truffle/attachments-optimise.rb
@@ -13,7 +13,7 @@ def foo
   foo * 2
 end
 
-Truffle::Attachments.attach __FILE__, 5 do |binding|
+Truffle::Attachments.attach __FILE__, 13 do |binding|
   binding.local_variable_set(:foo, 100)
 end