summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-05-27 14:57:16 -0700
committerAndre Arko <andre@arko.net>2012-05-27 19:38:31 -0700
commite1d71e7948537333f5b46d8532e4bf0afc3a8ba0 (patch)
tree8f4f033aad228ba308f513ac75999a8b5ff8d300
parent21df5d7a1b819ce5c349586c05c78bb838b85fb6 (diff)
downloadbundler-e1d71e7948537333f5b46d8532e4bf0afc3a8ba0.tar.gz
Version 1.1.4 with changelog
-rw-r--r--CHANGELOG.md10
-rw-r--r--lib/bundler/version.rb2
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35fe60fb37..a3f0515ec1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.1.4 (May 27, 2012)
+
+Bugfixes:
+
+ - Use `latest_release` in Capistrano and Vlad integration (#1264)
+ - Unknown exceptions now link to ISSUES for help instead of a new ticket
+ - When OpenSSL is missing, provide instructions for fixing (#1776 etc.)
+ - Correct inline help for `clean --force` (@dougbarth, #1911)
+ - Work around a Ruby 1.9.3p194 bug in Psych when config files are empty
+
## 1.1.3 (March 23, 2012)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 1cd58c25b9..2fd259aa09 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.1.3" unless defined?(::Bundler::VERSION)
+ VERSION = "1.1.4" unless defined?(::Bundler::VERSION)
end