Version 1.7.0 with changelogv1.7.0

2 files changed, 16 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e63a16bae..853fb19249 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.7.0 (2014-08-13)
+
+Security:
+
+  - Fix for CVE-2013-0334, installing gems from an unexpected source
+
+Features:
+
+  - Gemfile `source` calls now take a block containing gems from that source (@tmoore)
+  - added the `:source` option to `gem` to specify a source (@tmoore)
+
+Bugfixes:
+
+  - warn on ambiguous gems available from more than one source (@tmoore)
+
 ## 1.6.5 (2014-07-23)
 
 Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index b3a3439ca7..c479ecc74b 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.6.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.7.0" unless defined?(::Bundler::VERSION)
 end