From bc8dba65488798341acec7e6b71d52eae1301dbd Mon Sep 17 00:00:00 2001
From: Ev Kontsevoy <ev@kontsevoy.com>
Date: Mon, 16 Oct 2017 17:58:10 -0700
Subject: [PATCH] 2.3.5

- Updated the changelong
- Version bump to 2.3.5
---
 CHANGELOG.md | 17 +++++++++++++++++
 Makefile     |  2 +-
 version.go   |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7964f6a8f035..b82bb965d70f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## 2.3.5
+
+This release is focused on fixing a few regressions in configuration and UI/UX.
+
+#### Improvements
+
+* Updated documentation to accurately reflect 2.3 changes
+* Web UI can use introspection so users can skip explicitly specifying SSH port [#1410](https://github.com/gravitational/teleport/issues/1410)
+
+#### Bug fixes
+
+* Fixed issue of 2FA users getting prematurely locked out [#1347](https://github.com/gravitational/teleport/issues/1347)
+* UI (regression) when invite link is expired, nothing is shown to the user  [#1400](https://github.com/gravitational/teleport/issues/1400)
+* OIDC regression with some providers [#1371](https://github.com/gravitational/teleport/issues/1371)
+* Legacy configuration for trusted clusters regression: [#1381](https://github.com/gravitational/teleport/issues/1381)
+* Dynamic tokens for adding nodes: "access denied" [#1348](https://github.com/gravitational/teleport/issues/1348)
+
 ## 2.3.1
 
 #### Bug fixes
diff --git a/Makefile b/Makefile
index 85575cb66a192..5b5226ba88ce1 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 # Naming convention:
 #	for stable releases we use "1.0.0" format
 #   for pre-releases, we use   "1.0.0-beta.2" format
-VERSION=2.3.5-rc.2
+VERSION=2.3.5
 
 # These are standard autotools variables, don't change them please
 BUILDDIR ?= build
diff --git a/version.go b/version.go
index fcfc72abd9ea1..d8d6bd237da41 100644
--- a/version.go
+++ b/version.go
@@ -3,7 +3,7 @@
 package teleport
 
 const (
-	Version = "2.3.5-rc.2"
+	Version = "2.3.5"
 )
 
 // Gitref variable is automatically set to the output of git-describe