Skip to content

Commit a224ca2

Browse files
committed
Merge remote-tracking branch 'origin/2.4-develop' into Hammer-Platform-Health-Scope-02Dec24
2 parents 3f4c56c + 5d745d7 commit a224ca2

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

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"colinmollenhour/credis": "^1.15",
4141
"colinmollenhour/php-redis-session-abstract": "^2.0",
4242
"composer/composer": "^2.0, !=2.2.16",
43-
"elasticsearch/elasticsearch": "~7.17.0 || ~8.5.0",
43+
"elasticsearch/elasticsearch": "^7.17 || ^8.15",
4444
"ezyang/htmlpurifier": "^4.17",
4545
"guzzlehttp/guzzle": "^7.5",
4646
"laminas/laminas-captcha": "^2.17",

0 commit comments

Comments
 (0)