Merge branch '2.1' into develop

This commit is contained in:
Markus Mäkelä
2017-07-31 15:57:05 +03:00
27 changed files with 389 additions and 58 deletions

View File

@ -3,7 +3,7 @@
This document describes upgrading MaxScale from version 1.2.1 to 1.3.
The major changes can be found in the [changelog](../Changelog.md) and more
detailed information in the [release notes](../Release-Notes/MaxScale-1.3.0-Release-Notes.md).
detailed information in the MaxScale 1.3.0 release notes.
## Installation

View File

@ -3,10 +3,10 @@
This document describes upgrading MaxScale from version 1.3 to 1.4.
For more detailed information about MaxScale 1.4, please refer to:
* [MaxScale 1.4.3 release notes](../Release-Notes/MaxScale-1.4.3-Release-Notes.md)
* [MaxScale 1.4.2 release notes](../Release-Notes/MaxScale-1.4.2-Release-Notes.md)
* [MaxScale 1.4.1 release notes](../Release-Notes/MaxScale-1.4.1-Release-Notes.md)
* [MaxScale 1.4.0 release notes](../Release-Notes/MaxScale-1.4.0-Release-Notes.md)
* MaxScale 1.4.3 release notes
* MaxScale 1.4.2 release notes
* MaxScale 1.4.1 release notes
* MaxScale 1.4.0 release notes
## Installation

View File

@ -7,6 +7,7 @@ For more information about MariaDB MaxScale 2.1, please refer to the
[ChangeLog](../Changelog.md).
For a complete list of changes in MaxScale 2.1, refer to the
[MaxScale 2.1.5 Release Notes](../Release-Notes/MaxScale-2.1.5-Release-Notes.md).
[MaxScale 2.1.4 Release Notes](../Release-Notes/MaxScale-2.1.4-Release-Notes.md).
[MaxScale 2.1.3 Release Notes](../Release-Notes/MaxScale-2.1.3-Release-Notes.md).
[MaxScale 2.1.2 Release Notes](../Release-Notes/MaxScale-2.1.2-Release-Notes.md).