summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md13
-rw-r--r--lib/bundler/version.rb2
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b08c2d2e0..2dee71228e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.10.0.rc (2015-05-16)
+
+Features:
+
+ - dramatically speed up resolving some slow Gemfiles (#3635, @segiddins)
+ - track CI platforms running Bundler (#3646, @fotanus)
+
+Bugfixes:
+
+ - allow `viz` to work with prereleases (#3621, #3217, @aprescott)
+ - validate gemspecs used in path and git gems (#3639, @segiddins, @indirect)
+ - stop printing config warnings when config is unchanged (#3649, @fotanus, @indirect)
+
## 1.10.0.pre.2 (2015-05-07)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 22d6ef499b..d83055a683 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.10.0.pre.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.10.0.rc" unless defined?(::Bundler::VERSION)
end