summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-12-15 03:44:00 -0800
committerAndre Arko <andre@arko.net>2015-12-15 03:44:00 -0800
commitbbbb4115b2a7242a2e0bb17e13c514453b8c04da (patch)
treeba3faefc1f84b7cd938ba3e393a49a11eabcb369
parenta7349cb95c3d40f9795cf58ccd20062195358f02 (diff)
downloadbundler-bbbb4115b2a7242a2e0bb17e13c514453b8c04da.tar.gz
Version 1.11.1 and changelogv1.11.1
-rw-r--r--CHANGELOG.md9
-rw-r--r--lib/bundler/version.rb2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b6d2e6cfd..d81fbfd301 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.11.1 (2015-12-15)
+
+Bugfixes:
+
+ - lazy-load Psych, again (#4149, @indirect)
+ - allow gemspec gems on other platforms (#4150, @indirect)
+ - fix --no-coc and --no-mit flags on `gem` (#4148, @RochesterinNYC)
+ - stop calling `required_ruby_version` on nil @specifications (#4147, @indirect)
+
## 1.11.0 (2015-12-12)
(this space intentionally left blank)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 97811e5934..983b6c56fb 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.11.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.11.1" unless defined?(::Bundler::VERSION)
end