Add elasticsearch 5.x intrusion info in index.rst (#514)

for issue https://github.com/elastic/elasticsearch-py/issues/492
This commit is contained in:
ihipop
2017-01-10 09:50:18 +01:00
committed by Honza Král
parent a644af0e07
commit fa0ee04b8f
+7 -1
View File
@@ -17,6 +17,9 @@ Compatibility
The library is compatible with all Elasticsearch versions since ``0.90.x`` but you The library is compatible with all Elasticsearch versions since ``0.90.x`` but you
**have to use a matching major version**: **have to use a matching major version**:
For **Elasticsearch 5.0** and later, use the major version 5 (``5.x.y``) of the
library.
For **Elasticsearch 2.0** and later, use the major version 2 (``2.x.y``) of the For **Elasticsearch 2.0** and later, use the major version 2 (``2.x.y``) of the
library. library.
@@ -29,6 +32,9 @@ library.
The recommended way to set your requirements in your `setup.py` or The recommended way to set your requirements in your `setup.py` or
`requirements.txt` is:: `requirements.txt` is::
# Elasticsearch 5.x
elasticsearch>=5.0.0,<6.0.0
# Elasticsearch 2.x # Elasticsearch 2.x
elasticsearch>=2.0.0,<3.0.0 elasticsearch>=2.0.0,<3.0.0
@@ -38,7 +44,7 @@ The recommended way to set your requirements in your `setup.py` or
# Elasticsearch 0.90.x # Elasticsearch 0.90.x
elasticsearch<1.0.0 elasticsearch<1.0.0
The development is happening on ``master`` and ``1.x`` branches, respectively. The development is happening on ``master`` and ``2.x`` branches respectively.
Example Usage Example Usage
------------- -------------