Skip to content

Commit 8c8dd99

Browse files
Merge branch '2.4-develop' into phpdoc/scopeConfig
2 parents cf6e875 + 5d745d7 commit 8c8dd99

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/code/Magento/Elasticsearch/composer.json

+1-1
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

+1-1
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",

composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)