Merge branch '2.0' of https://github.com/magento-sparta/magento2ce into MDVA-158

Bukatar, Anna · Bukatar, Anna · commit 307912219bbe · 2016-06-29T11:09:45.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+2.0.7
+=============
+* GitHub requests:
+    * [#2984](https://github.com/magento/magento2/issues/2984) -- Payment config settings not decrypted when used?
+
+2.0.6
+=============
+* Functional fixes:
+    * Fixed issue with Redis sessions.
+    * Fixed issue with Varnish cache on GoDaddy.
+
+* Security fixes:
+    * This release contains several security fixes. We describe each issue in detail in the Magento Security Center (https://www.magento.com/security).
+
+* Enhancements:
+    * Management of file ownership and permissions have been made more flexible.
+    * Support for using the Redis adapter to provide session storage.
+
 2.0.5
 =============
 * Fixed bugs:
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -21,7 +21,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -9,7 +9,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
@@ -22,7 +22,7 @@
         "magento/module-checkout-agreements": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -10,7 +10,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -34,7 +34,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
@@ -9,7 +9,7 @@
         "magento/module-require-js": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
@@ -11,7 +11,7 @@
         "magento/module-authorization": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
@@ -8,7 +8,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
@@ -9,7 +9,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
@@ -12,7 +12,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
@@ -24,7 +24,7 @@
         "magento/module-checkout-agreements": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "proprietary"
     ],
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
@@ -20,7 +20,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
@@ -32,7 +32,7 @@
         "magento/module-sales-sample-data": "Sample Data version:100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
@@ -13,7 +13,7 @@
         "magento/module-user": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2ce",
     "description": "Magento 2 (Community Edition)",
     "type": "project",
-    "version": "2.0.5",
+    "version": "2.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -82,15 +82,15 @@
         "magento/module-admin-notification": "100.0.5",
         "magento/module-advanced-pricing-import-export": "100.0.6",
         "magento/module-authorization": "100.0.5",
-        "magento/module-authorizenet": "100.0.5",
-        "magento/module-backend": "100.0.6",
-        "magento/module-backup": "100.0.5",
-        "magento/module-braintree": "100.0.5",
+        "magento/module-authorizenet": "100.0.6",
+        "magento/module-backend": "100.0.7",
+        "magento/module-backup": "100.0.6",
+        "magento/module-braintree": "100.0.6",
         "magento/module-bundle": "100.0.5",
         "magento/module-bundle-import-export": "100.0.5",
         "magento/module-cache-invalidate": "100.0.5",
-        "magento/module-captcha": "100.0.6",
-        "magento/module-catalog": "100.0.6",
+        "magento/module-captcha": "100.0.7",
+        "magento/module-catalog": "100.0.7",
         "magento/module-catalog-import-export": "100.0.6",
         "magento/module-catalog-inventory": "100.0.5",
         "magento/module-catalog-rule": "100.0.5",
@@ -111,7 +111,7 @@
         "magento/module-currency-symbol": "100.0.5",
         "magento/module-customer": "100.0.6",
         "magento/module-customer-import-export": "100.0.5",
-        "magento/module-deploy": "100.0.5",
+        "magento/module-deploy": "100.0.6",
         "magento/module-developer": "100.0.5",
         "magento/module-dhl": "100.0.5",
         "magento/module-directory": "100.0.5",
@@ -129,28 +129,28 @@
         "magento/module-grouped-product": "100.0.5",
         "magento/module-import-export": "100.0.5",
         "magento/module-indexer": "100.0.5",
-        "magento/module-integration": "100.0.5",
+        "magento/module-integration": "100.0.6",
         "magento/module-layered-navigation": "100.0.5",
         "magento/module-media-storage": "100.0.5",
         "magento/module-msrp": "100.0.5",
         "magento/module-multishipping": "100.0.5",
         "magento/module-new-relic-reporting": "100.0.5",
         "magento/module-newsletter": "100.0.6",
-        "magento/module-offline-payments": "100.0.5",
+        "magento/module-offline-payments": "100.0.6",
         "magento/module-offline-shipping": "100.0.5",
-        "magento/module-page-cache": "100.0.5",
-        "magento/module-payment": "100.0.5",
-        "magento/module-paypal": "100.0.5",
+        "magento/module-page-cache": "100.0.6",
+        "magento/module-payment": "100.0.6",
+        "magento/module-paypal": "100.0.6",
         "magento/module-persistent": "100.0.5",
         "magento/module-product-alert": "100.0.5",
         "magento/module-product-video": "100.0.5",
-        "magento/module-quote": "100.0.5",
+        "magento/module-quote": "100.0.6",
         "magento/module-reports": "100.0.5",
         "magento/module-require-js": "100.0.5",
         "magento/module-review": "100.0.5",
         "magento/module-rss": "100.0.5",
         "magento/module-rule": "100.0.5",
-        "magento/module-sales": "100.0.6",
+        "magento/module-sales": "100.0.7",
         "magento/module-sales-rule": "100.0.5",
         "magento/module-sales-sequence": "100.0.5",
         "magento/module-sample-data": "100.0.5",
@@ -172,7 +172,7 @@
         "magento/module-usps": "100.0.5",
         "magento/module-variable": "100.0.5",
         "magento/module-version": "100.0.5",
-        "magento/module-webapi": "100.0.5",
+        "magento/module-webapi": "100.0.6",
         "magento/module-webapi-security": "100.0.1",
         "magento/module-weee": "100.0.5",
         "magento/module-widget": "100.0.6",
@@ -187,7 +187,7 @@
         "magento/language-nl_nl": "100.0.5",
         "magento/language-pt_br": "100.0.5",
         "magento/language-zh_hans_cn": "100.0.5",
-        "magento/framework": "100.0.7",
+        "magento/framework": "100.0.9",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "colinmollenhour/cache-backend-redis": "1.8",
         "components/jquery": "1.11.0",
diff --git a/composer.lock b/composer.lock
diff --git a/lib/internal/Magento/Framework/App/Config/Data.php b/lib/internal/Magento/Framework/App/Config/Data.php
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
