Merge pull request #1110 from gravitational/rjones/2.2.3

Release 2.2.3.
gravitational · Jun 27, 2017 · d370f47 · d370f47
2 parents 580cc5a + 8344e99
commit d370f47
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,17 @@
 # Changelog
 
+## 2.2.3
+
+### Bug fixes
+
+* Fixed issue with Trusted Clusters where a clusters could lose its signing keys. [#1050](https://github.com/gravitational/teleport/issues/1050).
+* Fixed SAML signing certificate export in Enterprise. [#1109](https://github.com/gravitational/teleport/issues/1109).
+
 ## 2.2.2
 
 ### Bug fixes
 
-* Fixed and issue where in certain situations `tctl ls` would not work. [#1102](https://github.com/gravitational/teleport/issues/1102).
+* Fixed an issue where in certain situations `tctl ls` would not work. [#1102](https://github.com/gravitational/teleport/issues/1102).
 
 ## 2.2.1
 

diff --git a/Makefile b/Makefile
@@ -2,7 +2,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.2.2
+VERSION=2.2.3
 
 # These are standard autotools variables, don't change them please
 BUILDDIR ?= build

diff --git a/version.go b/version.go
@@ -3,7 +3,7 @@
 package teleport
 
 const (
-	Version = "2.2.2"
+	Version = "2.2.3"
 )
 
 // Gitref variable is automatically set to the output of git-describe