Skip to content

Commit 4e77b1e

Browse files
author
Joan He
committed
Merge remote-tracking branch 'engcom/1-es-6-dependencies' into 2.3.1-qwerty-pr
2 parents 5288287 + 00a0f85 commit 4e77b1e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/code/Magento/Elasticsearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"magento/module-store": "*",
1313
"magento/module-catalog-inventory": "*",
1414
"magento/framework": "*",
15-
"elasticsearch/elasticsearch": "~2.0|~5.1"
15+
"elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

app/code/Magento/Elasticsearch6/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"magento/module-search": "*",
1010
"magento/module-store": "*",
1111
"magento/module-elasticsearch": "*",
12-
"elasticsearch/elasticsearch": "~6.1"
12+
"elasticsearch/elasticsearch": "~2.0|~5.1|~6.1"
1313
},
1414
"suggest": {
1515
"magento/module-config": "*"

0 commit comments

Comments
 (0)