summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-04-29 20:43:18 -0700
committerAndre Arko <andre@arko.net>2015-04-29 20:43:22 -0700
commit8beeb91dd125331750d56acfa255ae1739d60952 (patch)
tree4103003e9c1c20c8383ddc9d9aafa7818256b955
parentfd8a27eb08eaf1f07bbf5af9b2433849529d18fb (diff)
downloadbundler-1.7.15.tar.gz
Version 1.7.15 with changelogv1.7.15
[ci skip]
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae6b277d22..0c7f609c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.7.15 (2015-04-29)
+
+Bugfixes:
+
+ - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+
## 1.7.14 (2015-03-30)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index c799f9b8fa..ca77771043 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.7.14" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.15" unless defined?(::Bundler::VERSION)
end