Merge remote-tracking branch 'origin/msi-core-changes-no-history' into msi-core-changes-no-history

RomaKis · RomaKis · commit e4eab1384ea7 · 2018-03-20T16:57:36.000+02:00
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json b/app/code/Magento/CatalogInventory/etc/db_schema_whitelist.json
@@ -50,6 +50,7 @@
       "CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,
       "CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID": true,
       "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID": true,
+      "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID": true,
       "CATINV_STOCK_ITEM_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@`
`50`	`50`	`"CATINV_STOCK_ITEM_PRD_ID_CAT_PRD_ENTT_ENTT_ID": true,`
`51`	`51`	`"CATINV_STOCK_ITEM_STOCK_ID_CATINV_STOCK_STOCK_ID": true,`
`52`	`52`	`"CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_STOCK_ID": true,`
	`53`	`+ "CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID": true,`
`53`	`54`	`"CATINV_STOCK_ITEM_PRD_ID_SEQUENCE_PRD_SEQUENCE_VAL": true`
`54`	`55`	`}`
`55`	`56`	`},`