summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-08-16 13:04:13 -0700
committerAndre Arko <andre@arko.net>2014-08-16 13:04:13 -0700
commit924ad54fa9a0fa053c8254adabde2fe1d16a7b97 (patch)
tree22b9180b9e17cf22ef8eab4dcd6fe55f72ea917a
parentcc4c0df62d3550693693c9a8eefedaf4dedec734 (diff)
downloadbundler-924ad54fa9a0fa053c8254adabde2fe1d16a7b97.tar.gz
Version 1.7.1.pre with changelogv1.7.1.pre
-rw-r--r--CHANGELOG.md8
-rw-r--r--lib/bundler/version.rb2
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 853fb19249..82a11d1199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
+## 1.7.1
+
+Bugfixes:
+
+ - Install gems from one source needed by gems in another source (@indirect)
+
## 1.7.0 (2014-08-13)
Security:
- - Fix for CVE-2013-0334, installing gems from an unexpected source
+ - Fix for CVE-2013-0334, installing gems from an unexpected source (@tmoore)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index c479ecc74b..c27c7dc453 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.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.7.1.pre" unless defined?(::Bundler::VERSION)
end