Skip to content

Commit

Permalink
Add conflict with elasticsearch/elasticsearch version 6.8.1 (#1948)
Browse files Browse the repository at this point in the history
* Add conflict with elasticsearch/elasticsearch version 6.8.1

* Add changelog
  • Loading branch information
deguif authored Mar 24, 2021
1 parent 7ccba9c commit 3b34cdb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 3b34cdb

Please sign in to comment.