summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-05-10 13:52:22 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-05-10 13:52:22 -0500
commit474886adcce165ea25d70b7c9c3358f0c3c11e9b (patch)
tree66a465b87c7d4c911d0a30be2ce0eb102cab02a2 /CHANGELOG.md
parent49bbdebf91f4684e69190ae7c52c0bcc437574e6 (diff)
downloadbundler-474886adcce165ea25d70b7c9c3358f0c3c11e9b.tar.gz
Version 1.15.0.pre.4 with changelogv1.15.0.pre.4
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md7
1 files changed, 7 insertions, 0 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: