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 35fe60fb37..3b17cf5c76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 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 instead of blowing up
+
## 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