summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-08-17 20:21:39 -0700
committerAndre Arko <andre@arko.net>2014-08-17 20:21:39 -0700
commitad3ea31d81ff260f8a886afc794576f02b29d8bd (patch)
tree9cfcea3be209c8bd71a288b245891e2e1e2db4d1
parent4d49d0dd9671c0ac29ffe62f9ea817389bcf6daa (diff)
downloadbundler-ad3ea31d81ff260f8a886afc794576f02b29d8bd.tar.gz
Version 1.7.1.pre.2 with changelogv1.7.1.pre.2
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/bundler/version.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82a11d1199..ae61db0ef6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
Bugfixes:
- Install gems from one source needed by gems in another source (@indirect)
+ - Install the same gem versions even after some are installed (@tmoore)
## 1.7.0 (2014-08-13)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index c27c7dc453..6db3e7e35f 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.1.pre" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.1.pre.2" unless defined?(::Bundler::VERSION)
end