Skip to content

Commit 29754ae

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents 254c5cd + 19ad496 commit 29754ae

File tree

94 files changed

+4982
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4982
-287
lines changed

‎.htaccess

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,32 @@
5858

5959
</IfModule>
6060

61+
<IfModule mod_php7.c>
62+
63+
############################################
64+
## adjust memory limit
65+
66+
php_value memory_limit 768M
67+
php_value max_execution_time 18000
68+
69+
############################################
70+
## disable automatic session start
71+
## before autoload was initialized
72+
73+
php_flag session.auto_start off
74+
75+
############################################
76+
## enable resulting html compression
77+
78+
#php_flag zlib.output_compression on
79+
80+
###########################################
81+
## disable user agent verification to not break multiple image upload
82+
83+
php_flag suhosin.session.cryptua off
84+
85+
</IfModule>
86+
6187
<IfModule mod_security.c>
6288
###########################################
6389
## disable POST processing to not break multiple image upload

‎app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* Interface StockCollectionInterface
16+
* @api
1617
*/
1718
interface StockCollectionInterface extends SearchResultsInterface
1819
{

‎app/code/Magento/CatalogInventory/Api/Data/StockInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface Stock
12+
* @api
1213
*/
1314
interface StockInterface extends ExtensibleDataInterface
1415
{

‎app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* Interface StockItemCollectionInterface
16+
* @api
1617
*/
1718
interface StockItemCollectionInterface extends SearchResultsInterface
1819
{

‎app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface StockItem
12+
* @api
1213
*/
1314
interface StockItemInterface extends ExtensibleDataInterface
1415
{

‎app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Stock Status collection interface
12+
* @api
1213
*/
1314
interface StockStatusCollectionInterface extends SearchResultsInterface
1415
{

‎app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface StockStatusInterface
12+
* @api
1213
*/
1314
interface StockStatusInterface extends ExtensibleDataInterface
1415
{

‎app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Interface StockConfigurationInterface
10+
* @api
1011
*/
1112
interface StockConfigurationInterface
1213
{

‎app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Interface StockCriteriaInterface
10+
* @api
1011
*/
1112
interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
1213
{

‎app/code/Magento/CatalogInventory/Api/StockIndexInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Interface StockIndexInterface
10+
* @api
1011
*/
1112
interface StockIndexInterface
1213
{

0 commit comments

Comments
 (0)