summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md8
-rw-r--r--lib/bundler/version.rb2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc64b2fad..0dd1af44c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.12.1 (2016-04-30)
+
+Bugfixes:
+ - automatically fallback when the new index has a checksum mismatch instead of erroring (@segiddins)
+ - fix computation of new index file local checksums on Windows (#4472, @mwrock)
+ - properly handle certain resolver backtracking cases without erroring (@segiddins, #4484)
+ - ensure the `$LOAD_PATH` contains specs' load paths in the correct order (@segiddins, #4482)
+
## 1.12.0 (2016-04-28)
This space intentionally left blank.
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index f7103879ac..181813ae59 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,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.12.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.12.1" unless defined?(::Bundler::VERSION)
end