summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-01-04 17:16:54 -0800
committerAndre Arko <andre@arko.net>2015-01-04 17:16:54 -0800
commita4c825a26ff28367c7b0d056f6c632288af07648 (patch)
tree3ca9af916fa1b34eb85f0f415a9df62ed9ce70fd
parent0d0116ad37386f30c686423e94b24d794b701c6f (diff)
downloadbundler-a4c825a26ff28367c7b0d056f6c632288af07648.tar.gz
Version 1.7.11 with changelogv1.7.11
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15357a35f6..efe137783e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.7.11 (2015-01-04)
+
+Bugfixes:
+
+ - Recognize `:mri_22` and `:mingw_22`, rather than just `:ruby_22` (#3328, @myabc)
+
## 1.7.10 (2014-12-29)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index bb9ab84a7e..63b719482c 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.10" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.11" unless defined?(::Bundler::VERSION)
end