From 1fe7e93e9b0a36739c610a9fb7cdca0e6bc5b398 Mon Sep 17 00:00:00 2001
From: Colby Swandale <me@colby.fyi>
Date: Wed, 24 Oct 2018 21:31:06 +1100
Subject: [PATCH] Version 1.17.0 with changelog

---
 CHANGELOG.md           | 4 ++++
 lib/bundler/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 167423b810b..415cdd71bbc 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 6bec2e7052e..081b87784c0 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