diff options
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b21ff4b25..2d4e45ec11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 1.15.4 (2017-08-19) + +Bugfixes: + + - handle file conflicts gracefully in `bundle gem` (@rafaelfranca, @segiddins) + - bundler will fail gracefully when the bundle path contains the system path separator (#5485, ajwann) + - failed gem downloads will be retried consistently across different RubyGems versions (@shayonj) + - `bundle pristine` will respect build options while re-building native extensions (@NickLaMuro) + ## 1.15.3 (2017-07-21) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 4078f3e08e..b2dad6dfb6 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.3" unless defined?(::Bundler::VERSION) + VERSION = "1.15.4" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin |