From 9cec8fa0fbb0650bed1ed99327dd97678cfd92bf Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 12 Oct 2017 14:13:17 +0300
Subject: [PATCH] MXS-1464 Update ChangeLog and release notes

---
 Documentation/Changelog.md                    |  2 +
 .../MaxScale-2.2.1-Release-Notes.md           | 48 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 Documentation/Release-Notes/MaxScale-2.2.1-Release-Notes.md

diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index 63b333a0f..9649e927b 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -20,8 +20,10 @@
 * The Masking filter can now both obfuscate and partially mask columns.
 * Binlog router supports MariaDB 10 GTID at both ends.
 * KILL CONNECTION can now be used through MaxScale.
+* Environment variables can now be used in the MaxScale configuration file.
 
 For more details, please refer to:
+* [MariaDB MaxScale 2.2.1 Release Notes](Release-Notes/MaxScale-2.2.1-Release-Notes.md)
 * [MariaDB MaxScale 2.2.0 Release Notes](Release-Notes/MaxScale-2.2.0-Release-Notes.md)
 
 ## MariaDB MaxScale 2.1
diff --git a/Documentation/Release-Notes/MaxScale-2.2.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.1-Release-Notes.md
new file mode 100644
index 000000000..85ce98fe6
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.2.1-Release-Notes.md
@@ -0,0 +1,48 @@
+# MariaDB MaxScale 2.2.1 Release Notes
+
+Release 2.2.1 is a Beta release.
+
+This document describes the changes in release 2.2.1, when compared to
+release 2.2.0.
+
+For any problems you encounter, please consider submitting a bug
+report at [Jira](https://jira.mariadb.org).
+
+## Changed Features
+
+## Dropped Features
+
+## New Features
+
+### Environment Variables in the configuration file
+
+If the global configuration entry `substitute_variables` is set to true,
+then if the first character of a value in the configuration file is a `$`
+then everything following that is interpreted as an environment variable
+and the configuration value is replaced with the value of the environment
+variable. For more information please consult the
+[Configuration Guide](Getting-Started/Configuration-Guide.md).
+
+## Bug fixes
+
+[Here is a list of bugs fixed in MaxScale 2.2.1.](https://jira.mariadb.org/issues/?jql=project%20%3D%20MXS%20AND%20issuetype%20%3D%20Bug%20AND%20status%20%3D%20Closed%20AND%20fixVersion%20%3D%202.2.1)
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for the Linux distributions supported
+by MariaDB Enterprise.
+
+Packages can be downloaded [here](https://mariadb.com/resources/downloads).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is X.Y.Z. Further, *master* always refers to the latest released non-beta version.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).