Merge remote-tracking branch 'origin/1-17-stable'

* origin/1-17-stable: Version 1.17.1 with changelog Merge #6761
rubygems · Oct 29, 2018 · 42a3230 · 42a3230
2 parents 27ab011 + 2760d72
commit 42a3230
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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.