Merge tag 'v1.15.1'

Version 1.15.1
rubygems · Jun 2, 2017 · 28ab085 · 28ab085
2 parents 2e46e67 + 76f6459
commit 28ab085
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.15.1 (2017-06-02)
+
+Bugfixes:
+
+  - `bundle lock --update GEM` will fail gracefully when the gem is not in the lockfile (#5693, @segiddins)
+  - `bundle init --gemspec` will fail gracefully when the gemspec is invalid (@colby-swandale)
+  - `bundle install --force` works when the gemfile contains git gems (#5678, @segiddins)
+  - `bundle env` will print well-formed markdown when there are no settings (#5677, @segiddins)
+
 ## 1.15.0 (2017-05-19)
 
 This space intentionally left blank.

diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
@@ -7,7 +7,7 @@ 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.15.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.1" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin