Merge remote-tracking branch 'origin/2.1.8-develop' into 2.1.8-develo…

…p-pr14
magento · Apr 20, 2017 · 7a03b97 · 7a03b97
2 parents c477960 + b8b698b
commit 7a03b97
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 108 deletions.
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -33,7 +33,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "101.0.5",
+    "version": "101.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -13,7 +13,7 @@
         "magento/module-ui": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
@@ -15,7 +15,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
@@ -15,7 +15,7 @@
         "magento/module-deploy": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
@@ -23,7 +23,7 @@
         "magento/module-product-links-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.5",
+    "version": "100.1.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
@@ -11,7 +11,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
@@ -11,7 +11,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
@@ -22,7 +22,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.2",
+    "version": "100.1.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
@@ -19,7 +19,7 @@
         "magento/module-swatches-sample-data": "Sample Data version:100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "proprietary"
     ],

diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
@@ -6,7 +6,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-theme",
-    "version": "100.1.3",
+    "version": "100.1.4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
@@ -7,7 +7,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-theme",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/composer.json b/composer.json
@@ -88,21 +88,21 @@
         "magento/module-bundle-import-export": "100.1.3",
         "magento/module-cache-invalidate": "100.1.3",
         "magento/module-captcha": "100.1.3",
-        "magento/module-catalog": "101.0.5",
-        "magento/module-catalog-import-export": "100.1.3",
-        "magento/module-catalog-inventory": "100.1.4",
+        "magento/module-catalog": "101.0.6",
+        "magento/module-catalog-import-export": "100.1.4",
+        "magento/module-catalog-inventory": "100.1.5",
         "magento/module-catalog-rule": "100.1.4",
         "magento/module-catalog-rule-configurable": "100.1.3",
-        "magento/module-catalog-search": "100.1.4",
+        "magento/module-catalog-search": "100.1.5",
         "magento/module-catalog-url-rewrite": "100.1.3",
         "magento/module-catalog-widget": "100.1.2",
         "magento/module-checkout": "100.1.5",
         "magento/module-checkout-agreements": "100.1.2",
         "magento/module-cms": "101.0.4",
         "magento/module-cms-url-rewrite": "100.1.2",
-        "magento/module-config": "100.1.3",
+        "magento/module-config": "100.1.4",
         "magento/module-configurable-import-export": "100.1.2",
-        "magento/module-configurable-product": "100.1.5",
+        "magento/module-configurable-product": "100.1.6",
         "magento/module-contact": "100.1.3",
         "magento/module-cookie": "100.1.2",
         "magento/module-cron": "100.1.3",
@@ -115,7 +115,7 @@
         "magento/module-directory": "100.1.3",
         "magento/module-downloadable": "100.1.2",
         "magento/module-downloadable-import-export": "100.1.2",
-        "magento/module-eav": "100.1.4",
+        "magento/module-eav": "100.1.5",
         "magento/module-email": "100.1.3",
         "magento/module-encryption-key": "100.1.2",
         "magento/module-fedex": "100.1.3",
@@ -125,7 +125,7 @@
         "magento/module-google-optimizer": "100.1.2",
         "magento/module-grouped-import-export": "100.1.2",
         "magento/module-grouped-product": "100.1.3",
-        "magento/module-import-export": "100.1.3",
+        "magento/module-import-export": "100.1.4",
         "magento/module-indexer": "100.1.3",
         "magento/module-integration": "100.1.3",
         "magento/module-layered-navigation": "100.1.2",
@@ -143,7 +143,7 @@
         "magento/module-product-alert": "100.1.3",
         "magento/module-product-video": "100.1.4",
         "magento/module-quote": "100.1.4",
-        "magento/module-reports": "100.1.2",
+        "magento/module-reports": "100.1.3",
         "magento/module-require-js": "100.1.3",
         "magento/module-review": "100.1.2",
         "magento/module-rss": "100.1.2",
@@ -160,7 +160,7 @@
         "magento/module-sitemap": "100.1.3",
         "magento/module-store": "100.1.5",
         "magento/module-swagger": "100.1.2",
-        "magento/module-swatches": "100.1.4",
+        "magento/module-swatches": "100.1.5",
         "magento/module-swatches-layered-navigation": "100.1.2",
         "magento/module-tax": "100.1.2",
         "magento/module-tax-import-export": "100.1.2",
@@ -180,16 +180,16 @@
         "magento/module-widget": "100.1.2",
         "magento/module-wishlist": "100.1.4",
         "magento/theme-adminhtml-backend": "100.1.2",
-        "magento/theme-frontend-blank": "100.1.3",
-        "magento/theme-frontend-luma": "100.1.4",
+        "magento/theme-frontend-blank": "100.1.4",
+        "magento/theme-frontend-luma": "100.1.5",
         "magento/language-de_de": "100.1.1",
         "magento/language-en_us": "100.1.1",
         "magento/language-es_es": "100.1.1",
         "magento/language-fr_fr": "100.1.1",
         "magento/language-nl_nl": "100.1.1",
         "magento/language-pt_br": "100.1.1",
         "magento/language-zh_hans_cn": "100.1.1",
-        "magento/framework": "100.1.5",
+        "magento/framework": "100.1.6",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",