summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md10
-rw-r--r--lib/bundler/version.rb2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6e5d2efc0..15357a35f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.7.10 (2014-12-29)
+
+Bugfixes:
+
+ - Fix source blocks sometimes causing deployment mode to fail wrongly (#3298, @TimMoore)
+
+Features(?):
+
+ - Support `platform :mri_22` and related version bits (#3309, @thomasfedb)
+
## 1.7.9 (2014-12-09)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 2c7e7af949..bb9ab84a7e 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.7.9" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.10" unless defined?(::Bundler::VERSION)
end