Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr (75ea7d7d) · Commits · KIII-12 / Magento

Commit 75ea7d7d authored 9 years ago by

Cari Spruiell

Browse files

Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr

parents d01f7153 e7a0e89a

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/etc/di.xml 9 additions, 0 deletions

app/etc/di.xml
composer.json 2 additions, 2 deletions

composer.json
composer.lock 120 additions, 43 deletions

composer.lock
dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form.php 93 additions, 16 deletions

...sts/app/Magento/Backend/Test/Block/System/Config/Form.php
dev/tests/functional/tests/app/Magento/Backend/Test/Block/System/Config/Form/Group.php 41 additions, 35 deletions

...p/Magento/Backend/Test/Block/System/Config/Form/Group.php
dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php 77 additions, 0 deletions

...end/Test/Constraint/AssertHttpsHeaderOptionsAvailable.php
dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php 71 additions, 0 deletions

.../Test/Constraint/AssertHttpsHeaderOptionsNotAvailable.php
dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertStoreCanBeLocalized.php 2 additions, 3 deletions

...nto/Backend/Test/Constraint/AssertStoreCanBeLocalized.php
dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/SystemConfigEdit.xml 15 additions, 0 deletions

.../Magento/Backend/Test/Page/Adminhtml/SystemConfigEdit.xml
dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml 45 additions, 0 deletions

.../tests/app/Magento/Backend/Test/Repository/ConfigData.xml
dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php 52 additions, 0 deletions

...Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.php
dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.xml 18 additions, 0 deletions

...Magento/Backend/Test/TestCase/HttpsHeadersDisableTest.xml
dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php 52 additions, 0 deletions

.../Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.php
dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.xml 18 additions, 0 deletions

.../Magento/Backend/Test/TestCase/HttpsHeadersEnableTest.xml
lib/internal/Credis/Client.php 0 additions, 1113 deletions

lib/internal/Credis/Client.php
lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php 1 addition, 0 deletions

...l/Magento/Framework/Config/ConfigOptionsListConstants.php
lib/internal/Magento/Framework/Session/Config.php 37 additions, 3 deletions

lib/internal/Magento/Framework/Session/Config.php
lib/internal/Magento/Framework/Session/Config/ConfigInterface.php 15 additions, 0 deletions

...rnal/Magento/Framework/Session/Config/ConfigInterface.php
lib/internal/Magento/Framework/Session/SaveHandler.php 5 additions, 4 deletions

lib/internal/Magento/Framework/Session/SaveHandler.php
lib/internal/Magento/Framework/Session/SaveHandler/Redis.php 51 additions, 0 deletions

lib/internal/Magento/Framework/Session/SaveHandler/Redis.php

with 724 additions and 1219 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr