Merge branch 'mainline-develop' into MAGETWO-35251 (c35c622a) · Commits · KIII-12 / Magento

Commit c35c622a authored 10 years ago by

Valeriy Nayda

Browse files

Merge branch 'mainline-develop' into MAGETWO-35251

parents f911050f 8892f351

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Catalog/Api/ProductRepositoryInterface.php 0 additions, 6 deletions

app/code/Magento/Catalog/Api/ProductRepositoryInterface.php
app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 10 additions, 0 deletions

...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
app/code/Magento/Catalog/Model/ProductRepository.php 1 addition, 93 deletions

app/code/Magento/Catalog/Model/ProductRepository.php
app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php 0 additions, 134 deletions

...Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
app/code/Magento/Catalog/etc/webapi.xml 0 additions, 6 deletions

app/code/Magento/Catalog/etc/webapi.xml
app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php 15 additions, 1 deletion

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php 40 additions, 2 deletions

.../CatalogRule/Test/Unit/Model/Indexer/IndexBuilderTest.php
app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php 1 addition, 1 deletion

...de/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php 2 additions, 2 deletions

...de/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php 42 additions, 0 deletions

...code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
app/code/Magento/CatalogSearch/Model/Resource/Engine.php 3 additions, 3 deletions

app/code/Magento/CatalogSearch/Model/Resource/Engine.php
app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php 1 addition, 2 deletions

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php 1 addition, 1 deletion

...CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php 3 additions, 3 deletions

...rch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
app/code/Magento/CatalogSearch/etc/mview.xml 1 addition, 1 deletion

app/code/Magento/CatalogSearch/etc/mview.xml
app/code/Magento/Indexer/Model/IndexStructure.php 4 additions, 4 deletions

app/code/Magento/Indexer/Model/IndexStructure.php
app/code/Magento/Indexer/Model/SaveHandler/IndexerHandler.php 4 additions, 4 deletions

...code/Magento/Indexer/Model/SaveHandler/IndexerHandler.php
app/code/Magento/Indexer/Model/ScopeResolver/FlatScopeResolver.php 2 additions, 1 deletion

...Magento/Indexer/Model/ScopeResolver/FlatScopeResolver.php
app/code/Magento/Indexer/Model/ScopeResolver/IndexScopeResolver.php 1 addition, 1 deletion

...agento/Indexer/Model/ScopeResolver/IndexScopeResolver.php
app/code/Magento/Indexer/Test/Unit/Model/IndexStructureTest.php 4 additions, 4 deletions

...de/Magento/Indexer/Test/Unit/Model/IndexStructureTest.php

with 135 additions and 269 deletions

Please register or to comment

Admin message

Merge branch 'mainline-develop' into MAGETWO-35251