summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-01-21 14:52:21 -0600
committerSamuel Giddins <segiddins@segiddins.me>2017-01-21 14:52:21 -0600
commit915806bb762a7f1ebf0d55caa2d7833c940608c5 (patch)
tree0d6a707ee1bb98a98ff54d0afb28de96adc612fc
parente60c73554ddc6d5bd58b1967c0c4c4acf3a5c253 (diff)
parentbdef06e5d7f981e48ee83c3a0959f70f08493ca2 (diff)
downloadbundler-915806bb762a7f1ebf0d55caa2d7833c940608c5.tar.gz
Merge tag 'v1.14.1'
Version 1.14.1
-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 091979f5e2..eb7d07850e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.14.1 (2017-01-21)
+
+Bugfixes:
+
+ - work around a ruby 2.2.2 bug that caused a stack consistency error during installation (#5342, @segiddins)
+
## 1.14.0 (2017-01-20)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index a55df76934..ebd878e0ff 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.14.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.14.1" unless defined?(::Bundler::VERSION)
end