summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-04-21 15:52:47 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-04-21 15:52:47 -0500
commit0f20a951d6056249bdbcb16a4ec9ba195237e273 (patch)
treed74606e85348b5465f5aa7a36ca0ea9354f70714
parent50bc1a2740eda56ef504b06aa11c4743b59dad12 (diff)
parentd40efa845428cabfcdfcea7e4a14ed8ffb3e7639 (diff)
downloadbundler-0f20a951d6056249bdbcb16a4ec9ba195237e273.tar.gz
Merge tag 'v1.12.0.rc.4'
Version 1.12.0.rc.4
-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 ad8ee0dad0..2de97e77c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.12.0.rc.4 (2016-04-21)
+
+Bugfixes:
+
+ - don't fail when `bundle outdated` is run with flags and the lockfile contains non-semver versions (#4438, @RochesterinNYC)
+
## 1.12.0.rc.3 (2016-04-19)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 9020abce78..7160a0fb2d 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.rc.3" unless defined?(::Bundler::VERSION)
+ VERSION = "1.12.0.rc.4" unless defined?(::Bundler::VERSION)
end