summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2018-10-25 12:57:38 -0700
committerAndre Arko <andre@arko.net>2018-10-25 12:57:38 -0700
commit2760d72d3b2a1070b279536c33d3a89aaad7426b (patch)
treecbed674a16af45212eed09a473d6e8c9081dfc42
parentca755c722434c60ec172831c6959d4687c6be2ed (diff)
downloadbundler-1.17.1.tar.gz
Version 1.17.1 with changelogv1.17.1
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/bundler/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 415cdd71bb..33b9528d31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 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)
+
## 1.17.0 (2018-10-25)
No new changes.
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 081b87784c..02ec96adc9 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.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.17.1" unless defined?(::Bundler::VERSION)
def self.overwrite_loaded_gem_version
begin