Skip to content

Commit

Permalink
Merge pull request #57 from magento-commerce/develop
Browse files Browse the repository at this point in the history
Merge develop into 2002.1
  • Loading branch information
oshmyheliuk authored Jul 20, 2021
2 parents 3bf9f45 + aa57818 commit d2f9425
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
20 changes: 7 additions & 13 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "magento/ece-tools",
"description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
"type": "magento2-component",
"version": "2002.1.6",
"version": "2002.1.7",
"license": "OSL-3.0",
"repositories": {
"repo.magento.com": {
Expand All @@ -16,15 +16,15 @@
"ext-json": "*",
"ext-sockets": "*",
"colinmollenhour/credis": "^1.6.0",
"composer/composer": "^1.4",
"composer/semver": "^1.4",
"composer/composer": "^1.4||^2.0",
"composer/semver": "@stable",
"graylog2/gelf-php": "^1.4.2",
"guzzlehttp/guzzle": "^6.2",
"illuminate/config": "^5.5",
"magento/magento-cloud-components": "^1.0.6",
"magento/magento-cloud-docker": "^1.0.0",
"magento/magento-cloud-patches": "^1.0.6",
"magento/quality-patches": "^1.0.3",
"magento/magento-cloud-components": "^1.0.8",
"magento/magento-cloud-docker": "^1.2",
"magento/magento-cloud-patches": "^1.0.11",
"magento/quality-patches": "^1.0.26",
"monolog/monolog": "^1.16",
"nesbot/carbon": "^1.0||^2.0",
"psr/container": "^1.0",
Expand Down Expand Up @@ -94,12 +94,6 @@
},
"prefer-stable": true,
"extra": {
"map": [
[
"dist/.magento.env.yaml",
".magento.env.yaml.dist"
]
],
"include_files": [
"vendor/codeception/phpunit-wrapper/src/phpunit7-interfaces.php"
]
Expand Down
4 changes: 3 additions & 1 deletion config/eol.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ php:
- version: '7.3'
eol: 2021-12-06
- version: '7.4'
eol:
eol: 2022-11-28
mariadb:
- version: '10.0'
eol: 2019-03-31
Expand Down Expand Up @@ -40,6 +40,8 @@ elasticsearch:
eol: 2021-08-11
- version: '7.7'
eol: 2021-11-13
- version: '7.9'
eol: 2022-02-18
rabbitmq:
- version: '3.5'
eol: 2016-10-31
Expand Down

0 comments on commit d2f9425

Please sign in to comment.