Update versions for Graylog 2.2.x (Graylog2#251)

* Updating some magic values for 2.2.
* Update version number of integrated ES client.
* Update version requirement for enterprise plugin.
* Adding beta tag to version number.

Author: dennisoelkers

README.md

@@ -1,5 +1,5 @@
 # The Graylog documentation
-[![Build Status](https://travis-ci.org/Graylog2/documentation.svg?branch=2.1)](https://travis-ci.org/Graylog2/documentation)
+[![Build Status](https://travis-ci.org/Graylog2/documentation.svg?branch=2.2)](https://travis-ci.org/Graylog2/documentation)
 
 ## Building locally
 

conf.py

@@ -56,16 +56,16 @@
 
 # General information about the project.
 project = u'Graylog'
-copyright = u'2015-2016 Graylog, Inc.'
+copyright = u'2015-2017 Graylog, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.1'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.2.0-beta.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pages/configuration/elasticsearch.rst

@@ -27,6 +27,7 @@ Graylog version  Elasticsearch version
 2.0.0            2.3.1
 2.0.1-2.0.3      2.3.2
 2.1.0-2.1.1      2.3.5
+2.2.0            2.4.3
 ===============  =====================
 
 .. caution:: Graylog 2.x **does not** work with Elasticsearch 5.x!

pages/enterprise/setup.rst

@@ -21,7 +21,7 @@ The following list shows the minimum required Graylog versions for the Graylog E
     * - 1.0.x
       - >= 2.0.2, < 2.1.0
     * - 1.1.x
-      - >= 2.1.0, < 2.2.0
+      - >= 2.1.0, <= 2.2.0
 
 Installation
 ============