diff --git a/CHANGELOG.md b/CHANGELOG.md index 871097389b..2131255c1b 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file based on the ### Backward Compatibility Breaks ### Bugfixes +* Added conflict with `elasticsearch/elasticsearch` version `6.8.1` [#1948](https://github.com/ruflin/Elastica/pull/1948) ### Added ### Improvements ### Deprecated diff --git a/composer.json b/composer.json index fbb0917842..d60cfa815a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "phpunit/phpunit": "^6.0" }, "conflict": { - "elasticsearch/elasticsearch": "6.8.0" + "elasticsearch/elasticsearch": "6.8.0 || 6.8.1" }, "suggest": { "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service",