diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 55a3b8a932..0bc2457321 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.15.0.pre.4 (2017-05-10) + +Bugfixes: + + - avoid conflicts when `Gem.finish_resolve` is called after the bundle has been set up (@segiddins) + - ensure that `Gem::Specification.find_by_name` always returns an object that can have `#to_spec` called on it (#5592, @jules2689) + ## 1.15.0.pre.3 (2017-04-30) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index e8a024975d..80380a3878 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -7,7 +7,7 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.15.0.pre.3" unless defined?(::Bundler::VERSION) + VERSION = "1.15.0.pre.4" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin |