Skip to content

Commit 857d3ec

Browse files
committed
Merge remote-tracking branch 'origin/AC-7821' into Hammer_Regression_issues_07Feb23
2 parents e6e8b7f + 7e02702 commit 857d3ec

File tree

27 files changed

+2
-2374
lines changed

27 files changed

+2
-2374
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": "~7.17.0"
15+
"elasticsearch/elasticsearch": "^7.17 || ^8.0"
1616
},
1717
"suggest": {
1818
"magento/module-config": "*"

app/code/Magento/Elasticsearch8/Block/Adminhtml/System/Config/TestConnection.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/code/Magento/Elasticsearch8/LICENSE.txt

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)