Merge branch 'develop' into BUGS

# Conflicts: # app/code/Magento/Email/composer.json
magento · Jun 24, 2016 · b50734c · b50734c
2 parents 0c406d1 + 7e9d181
commit b50734c
Show file tree

Hide file tree

Showing 119 changed files with 1,072 additions and 1,066 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+2.1.0
+=============
+To get detailed information about changes in Magento 2.1.0, please visit [Magento Community Edition (CE) Release Notes](http://devdocs.magento.com/guides/v2.1/release-notes/ReleaseNotes2.1.0CE.html "Magento Community Edition (CE) Release Notes")
+
 2.0.0
 =============
 * Fixed bugs:

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-media-storage": "100.1.*",
-        "magento/framework": "100.1.*",
+        "magento/module-store": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-media-storage": "100.2.*",
+        "magento/framework": "100.2.*",
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-catalog": "101.0.*",
-        "magento/module-catalog-inventory": "100.1.*",
-        "magento/module-eav": "100.1.*",
-        "magento/module-import-export": "100.1.*",
-        "magento/module-catalog-import-export": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-store": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-catalog": "101.1.*",
+        "magento/module-catalog-inventory": "100.2.*",
+        "magento/module-eav": "100.2.*",
+        "magento/module-import-export": "100.2.*",
+        "magento/module-catalog-import-export": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-store": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -3,11 +3,11 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-backend": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-backend": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -3,17 +3,17 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-sales": "100.1.*",
-        "magento/module-store": "100.1.*",
-        "magento/module-quote": "100.1.*",
-        "magento/module-checkout": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-payment": "100.1.*",
-        "magento/module-catalog": "101.0.*",
-        "magento/framework": "100.1.*"
+        "magento/module-sales": "100.2.*",
+        "magento/module-store": "100.2.*",
+        "magento/module-quote": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-payment": "100.2.*",
+        "magento/module-catalog": "101.1.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "proprietary"
     ],

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -3,26 +3,26 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-directory": "100.1.*",
-        "magento/module-developer": "100.1.*",
-        "magento/module-eav": "100.1.*",
-        "magento/module-theme": "100.1.*",
-        "magento/module-reports": "100.1.*",
-        "magento/module-sales": "100.1.*",
-        "magento/module-quote": "100.1.*",
-        "magento/module-catalog": "101.0.*",
-        "magento/module-user": "100.1.*",
-        "magento/module-security": "100.1.*",
-        "magento/module-backup": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-translation": "100.1.*",
-        "magento/module-require-js": "100.1.*",
-        "magento/module-config": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-store": "100.2.*",
+        "magento/module-directory": "100.2.*",
+        "magento/module-developer": "100.2.*",
+        "magento/module-eav": "100.2.*",
+        "magento/module-theme": "100.2.*",
+        "magento/module-reports": "100.2.*",
+        "magento/module-sales": "100.2.*",
+        "magento/module-quote": "100.2.*",
+        "magento/module-catalog": "101.1.*",
+        "magento/module-user": "100.2.*",
+        "magento/module-security": "100.2.*",
+        "magento/module-backup": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-translation": "100.2.*",
+        "magento/module-require-js": "100.2.*",
+        "magento/module-config": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-cron": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-store": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-cron": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/framework": "100.1.*",
+        "magento/framework": "100.2.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-config": "100.1.*",
-        "magento/module-directory": "100.1.*",
-        "magento/module-payment": "100.1.*",
-        "magento/module-checkout": "100.1.*",
-        "magento/module-sales": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-vault": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-catalog": "101.0.*",
-        "magento/module-quote": "100.1.*",
-        "magento/module-paypal": "100.1.*",
-        "magento/module-theme": "100.1.*",
+        "magento/module-config": "100.2.*",
+        "magento/module-directory": "100.2.*",
+        "magento/module-payment": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-sales": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-vault": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-catalog": "101.1.*",
+        "magento/module-quote": "100.2.*",
+        "magento/module-paypal": "100.2.*",
+        "magento/module-theme": "100.2.*",
         "braintree/braintree_php": "3.7.0"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.1.*"
+        "magento/module-checkout-agreements": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "proprietary"
     ],

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -3,29 +3,29 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-catalog": "101.0.*",
-        "magento/module-tax": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-sales": "100.1.*",
-        "magento/module-checkout": "100.1.*",
-        "magento/module-catalog-inventory": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-catalog-rule": "100.1.*",
-        "magento/module-eav": "100.1.*",
-        "magento/module-config": "100.1.*",
-        "magento/module-gift-message": "100.1.*",
-        "magento/framework": "100.1.*",
-        "magento/module-quote": "100.1.*",
-        "magento/module-media-storage": "100.1.*",
-        "magento/module-ui": "100.1.*"
+        "magento/module-store": "100.2.*",
+        "magento/module-catalog": "101.1.*",
+        "magento/module-tax": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-sales": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-catalog-inventory": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-catalog-rule": "100.2.*",
+        "magento/module-eav": "100.2.*",
+        "magento/module-config": "100.2.*",
+        "magento/module-gift-message": "100.2.*",
+        "magento/framework": "100.2.*",
+        "magento/module-quote": "100.2.*",
+        "magento/module-media-storage": "100.2.*",
+        "magento/module-ui": "100.2.*"
     },
     "suggest": {
-        "magento/module-webapi": "100.1.*",
-        "magento/module-bundle-sample-data": "Sample Data version:100.1.*"
+        "magento/module-webapi": "100.2.*",
+        "magento/module-bundle-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-catalog": "101.0.*",
-        "magento/module-import-export": "100.1.*",
-        "magento/module-catalog-import-export": "100.1.*",
-        "magento/module-bundle": "100.1.*",
-        "magento/module-eav": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-catalog": "101.1.*",
+        "magento/module-import-export": "100.2.*",
+        "magento/module-catalog-import-export": "100.2.*",
+        "magento/module-bundle": "100.2.*",
+        "magento/module-eav": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-page-cache": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-page-cache": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-checkout": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/framework": "100.1.*"
+        "magento/module-store": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/framework": "100.2.*"
     },
     "type": "magento2-module",
-    "version": "100.1.0-rc3",
+    "version": "100.2.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -3,37 +3,37 @@
     "description": "N/A",
     "require": {
         "php": "~5.6.0|7.0.2|~7.0.6",
-        "magento/module-store": "100.1.*",
-        "magento/module-eav": "100.1.*",
-        "magento/module-cms": "101.0.*",
-        "magento/module-indexer": "100.1.*",
-        "magento/module-customer": "100.1.*",
-        "magento/module-theme": "100.1.*",
-        "magento/module-checkout": "100.1.*",
-        "magento/module-backend": "100.1.*",
-        "magento/module-widget": "100.1.*",
-        "magento/module-wishlist": "100.1.*",
-        "magento/module-tax": "100.1.*",
-        "magento/module-msrp": "100.1.*",
-        "magento/module-catalog-inventory": "100.1.*",
-        "magento/module-directory": "100.1.*",
-        "magento/module-catalog-rule": "100.1.*",
-        "magento/module-product-alert": "100.1.*",
-        "magento/module-url-rewrite": "100.1.*",
-        "magento/module-catalog-url-rewrite": "100.1.*",
-        "magento/module-page-cache": "100.1.*",
-        "magento/module-quote": "100.1.*",
-        "magento/module-config": "100.1.*",
-        "magento/module-media-storage": "100.1.*",
-        "magento/framework": "100.1.*",
-        "magento/module-ui": "100.1.*"
+        "magento/module-store": "100.2.*",
+        "magento/module-eav": "100.2.*",
+        "magento/module-cms": "101.1.*",
+        "magento/module-indexer": "100.2.*",
+        "magento/module-customer": "100.2.*",
+        "magento/module-theme": "100.2.*",
+        "magento/module-checkout": "100.2.*",
+        "magento/module-backend": "100.2.*",
+        "magento/module-widget": "100.2.*",
+        "magento/module-wishlist": "100.2.*",
+        "magento/module-tax": "100.2.*",
+        "magento/module-msrp": "100.2.*",
+        "magento/module-catalog-inventory": "100.2.*",
+        "magento/module-directory": "100.2.*",
+        "magento/module-catalog-rule": "100.2.*",
+        "magento/module-product-alert": "100.2.*",
+        "magento/module-url-rewrite": "100.2.*",
+        "magento/module-catalog-url-rewrite": "100.2.*",
+        "magento/module-page-cache": "100.2.*",
+        "magento/module-quote": "100.2.*",
+        "magento/module-config": "100.2.*",
+        "magento/module-media-storage": "100.2.*",
+        "magento/framework": "100.2.*",
+        "magento/module-ui": "100.2.*"
     },
     "suggest": {
-        "magento/module-cookie": "100.1.*",
-        "magento/module-catalog-sample-data": "Sample Data version:100.1.*"
+        "magento/module-cookie": "100.2.*",
+        "magento/module-catalog-sample-data": "Sample Data version:100.2.*"
     },
     "type": "magento2-module",
-    "version": "101.0.0-rc3",
+    "version": "101.1.0-dev",
     "license": [
         "OSL-3.0",
         "AFL-3.0"