summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-04-29 20:57:23 -0700
committerAndre Arko <andre@arko.net>2015-04-29 20:57:23 -0700
commite9bafedd51e15915427442f09d662b10b3fef14f (patch)
tree1c305235215fa7caa13d3868af7a65ef269f37dc
parent363f3076c3e8beafd852b2948ead86c3d6b07b02 (diff)
downloadbundler-e9bafedd51e15915427442f09d662b10b3fef14f.tar.gz
Version 1.9.5 with changelogv1.9.5
-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 5714d43dc8..96eca72297 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.9.5 (2015-04-29)
+
+Bugfixes:
+
+ - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+
## 1.9.4 (2015-04-13)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 3dfc25db76..7d473a297f 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.9.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.9.5" unless defined?(::Bundler::VERSION)
end