Merge pull request #70 from magento-okapis/MAGETWO-80581

MAGETWO-80581: Merge code from 2.2.0 release branches into "2.2-develop" branches

Author: cpartica

app/code/Magento/CatalogRuleSampleData/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-catalog-rule": "100.2.*",
+        "magento/module-catalog-rule": "101.0.*",
         "magento/module-sample-data": "100.2.*"
     },
     "type": "magento2-module",

app/code/Magento/CmsSampleData/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-cms": "101.1.*",
+        "magento/module-cms": "102.0.*",
         "magento/module-sample-data": "100.2.*",
         "magento/module-theme-sample-data": "100.2.*",
         "magento/sample-data-media": "100.2.*"

app/code/Magento/SalesRuleSampleData/composer.json

@@ -5,8 +5,8 @@
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-sample-data": "100.2.*",
         "magento/module-catalog-rule-sample-data": "100.2.*",
-        "magento/module-sales-rule": "100.2.*",
-        "magento/module-eav": "100.2.*"
+        "magento/module-sales-rule": "101.0.*",
+        "magento/module-eav": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/SalesSampleData/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-sales": "100.2.*",
+        "magento/module-sales": "101.0.*",
         "magento/module-sample-data": "100.2.*",
         "magento/module-configurable-sample-data": "100.2.*"
     },

app/code/Magento/SwatchesSampleData/composer.json

@@ -5,7 +5,7 @@
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-swatches": "100.2.*",
         "magento/module-sample-data": "100.2.*",
-        "magento/module-eav": "100.2.*"
+        "magento/module-eav": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/WidgetSampleData/composer.json

@@ -3,10 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-widget": "100.2.*",
+        "magento/module-widget": "101.0.*",
         "magento/module-sample-data": "100.2.*",
         "magento/module-theme": "100.2.*",
-        "magento/module-cms": "101.1.*"
+        "magento/module-cms": "102.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.0-dev",

app/code/Magento/WishlistSampleData/composer.json

@@ -3,7 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
-        "magento/module-wishlist": "100.2.*",
+        "magento/module-wishlist": "101.0.*",
         "magento/module-sample-data": "100.2.*"
     },
     "type": "magento2-module",