diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 33b9528d31..a32c73a1e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.17.2 (2018-12-11) + + - Add compatibility for bundler merge with Ruby 2.6 + ## 1.17.1 (2018-10-25) - Convert `Pathname`s to `String`s before sorting them, fixing #6760 and #6758 ([#6761](https://github.com/bundler/bundler/pull/6761), @alexggordon) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 02ec96adc9..01b28c08eb 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.17.1" unless defined?(::Bundler::VERSION) + VERSION = "1.17.2" unless defined?(::Bundler::VERSION) def self.overwrite_loaded_gem_version begin |