From 76f6459389b4eec6177ccd959fd7a3922d9ff034 Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Fri, 2 Jun 2017 00:14:43 -0500
Subject: Version 1.15.1 with changelog

---
 CHANGELOG.md           | 9 +++++++++
 lib/bundler/version.rb | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b54d4a8fdd..98929ba648 100644
--- 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
index 401655269d..3f9a1211fb 100644
--- 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
-- 
cgit v1.2.1