summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2013-12-18 15:53:39 -0800
committerAndre Arko <andre@arko.net>2013-12-18 21:35:24 -0800
commitbd677ee55c0c657581113afef40219e2dabd85c4 (patch)
tree6c6af833a31bf3cfa818e0b87a6ad97e9735dacc
parent4139366de498746483cdbf389f4504af3cb3f05f (diff)
downloadbundler-bd677ee55c0c657581113afef40219e2dabd85c4.tar.gz
Version 1.5.0.rc.2 with changelogv1.5.0.rc.2
[ci skip]
-rw-r--r--CHANGELOG.md12
-rw-r--r--lib/bundler/version.rb2
2 files changed, 13 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffc9b0318f..58f08c9b69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.5.0.rc.2 (2013-12-18)
+
+"Features":
+
+ - Support threaded installation on Rubygems 2.0.7+
+ - Debug installation logs in .bundle/install.log
+
+"Bugfixes":
+
+ - Try to catch gem installation race conditions
+
+
## 1.5.0.rc.1 (2013-11-09)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 5a571971bf..df360efcd7 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -2,5 +2,5 @@ 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.5.0.rc.1" unless defined?(::Bundler::VERSION)
+ VERSION = "1.5.0.rc.2" unless defined?(::Bundler::VERSION)
end