Merge branch 'master' into fix_no_userinfo_endpoint

gravitational · Apr 11, 2017 · 95c249f · 95c249f
2 parents f98a645 + 5d46d52
commit 95c249f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.0.1
+
+### Features
+
+* Introduced Dynamic Roles. [#897](https://github.com/gravitational/teleport/pull/897)
+
+### Improvements
+
+* Improved OpenSSH interoperability. [#902](https://github.com/gravitational/teleport/pull/902), [#911](https://github.com/gravitational/teleport/pull/911)
+* Enhanced OIDC Functionality. [#882](https://github.com/gravitational/teleport/pull/882)
+
+### Bugfixes
+
+* Fixed Regressions. [#874](https://github.com/gravitational/teleport/pull/874), [#876](https://github.com/gravitational/teleport/pull/876), [#883](https://github.com/gravitational/teleport/pull/883), [#892](https://github.com/gravitational/teleport/pull/892), and [#906](https://github.com/gravitational/teleport/pull/906)
+
 ## 2.0
 
 This is a major new release of Teleport.

diff --git a/Makefile b/Makefile
@@ -116,6 +116,9 @@ tag:
 release: clean all $(BUILDDIR)/webassets.zip
 	cp -f build.assets/release.mk $(BUILDDIR)/Makefile
 	cat $(BUILDDIR)/webassets.zip >> $(BUILDDIR)/teleport
+	rm -fr $(BUILDDIR)/webassets.zip
+	cp README.md $(BUILDDIR)
+	cp CHANGELOG.md $(BUILDDIR)
 	zip -q -A $(BUILDDIR)/teleport
 	cp -rf $(BUILDDIR) teleport
 	@echo $(GITTAG) > teleport/VERSION