summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/bundler/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167423b810..415cdd71bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.17.0 (2018-10-25)
+
+No new changes.
+
## 1.17.0.pre.2 (2018-10-13)
Features:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 6bec2e7052..081b87784c 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,7 +7,7 @@ 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.17.0.pre.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.17.0" unless defined?(::Bundler::VERSION)
def self.overwrite_loaded_gem_version
begin