summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--lib/bundler/version.rb2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f17b1d78c1..a6b47b7d8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.11.0.pre.2 (2015-12-06)
+
+Bugfixes:
+
+ - fail gracefully when trying to execute a non-executable file (#4081, @fotanus)
+ - fix a crash when pushing a gem via `rake release` (@segiddins)
+
## 1.11.0.pre.1 (2015-11-29)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 5bf1cb03c1..d753d21cdc 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.11.0.pre.1" unless defined?(::Bundler::VERSION)
+ VERSION = "1.11.0.pre.2" unless defined?(::Bundler::VERSION)
end