Merge remote-tracking branch 'upstream/develop' into MAGETWO-58680-remove-unserialize-cache-frontend-interface-rebased

Joan He · Joan He · commit 47ff9db08cfe · 2016-11-04T17:31:53.000-05:00
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
@@ -54,7 +54,7 @@ public function __construct(
     public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-        if (version_compare($context->getVersion(), '2.0.2') < 0) {
+        if (version_compare($context->getVersion(), '2.2.0') < 0) {
             $this->upgradeCatalogInventoryStockItem($setup);
         }
         $setup->endSetup();
diff --git a/app/code/Magento/CatalogInventory/etc/module.xml b/app/code/Magento/CatalogInventory/etc/module.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CatalogInventory" setup_version="2.0.2">
+    <module name="Magento_CatalogInventory" setup_version="2.2.0">
         <sequence>
             <module name="Magento_Catalog"/>
         </sequence>

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(`
`54`	`54`	`public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface $context)`
`55`	`55`	`{`
`56`	`56`	`$setup->startSetup();`
`57`		`- if (version_compare($context->getVersion(), '2.0.2') < 0) {`
	`57`	`+ if (version_compare($context->getVersion(), '2.2.0') < 0) {`
`58`	`58`	`$this->upgradeCatalogInventoryStockItem($setup);`
`59`	`59`	`}`
`60`	`60`	`$setup->endSetup();`