aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-03-30 21:58:12 +0100
committerAndre Arko <andre@arko.net>2015-03-30 21:58:12 +0100
commit7e0ffb06b666c08337635cba522c543af782b090 (patch)
tree3f1190572404f13449a2aae39738e3bf1dcac45b /CHANGELOG.md
parentf880ba4d7422cafe315066dacd12f9d82e4a290e (diff)
parent52625b1a1e25d3145cbe6f6ed19799f55c4049ae (diff)
downloadbundler-7e0ffb06b666c08337635cba522c543af782b090.tar.gz
Merge tag 'v1.8.6' into 1-9-stable
Version 1.8.6 Conflicts: CHANGELOG.md lib/bundler/version.rb
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 2ff61c8a..d0c19f9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,13 @@ Features:
- Molinillo resolver, shared with CocoaPods (@segiddins)
- updated Thor to v0.19.1 (@segiddins)
+## 1.8.6 (2015-03-30)
+
+Bugfixes:
+
+ - keep gems locked when updating another gem from the same source (#3250, @indirect)
+ - resolve race that could build gems without saved arguments (#3404, @indirect)
+
## 1.8.5 (2015-03-11)
Bugfixes: