Merge remote-tracking branch 'origin/develop' into db-upgrade-pr

cpartica · cpartica · commit 841f688a84f4 · 2017-05-31T10:36:37.000-05:00
# Conflicts:
#	app/code/Magento/SalesRuleSampleData/fixtures/sales_rules.csv
diff --git a/app/code/Magento/CatalogRuleSampleData/fixtures/catalog_rules.csv b/app/code/Magento/CatalogRuleSampleData/fixtures/catalog_rules.csv
@@ -1,2 +1,2 @@
 name,description,simple_action,discount_amount,is_active,conditions_serialized,actions_serialized
-"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":""is_value_processed"",""0"":false}]}","{""type"":""Magento\\CatalogRule\\Model\\Rule\\Action\\Collection"",""attribute"":null,""operator"":""="",""value"":null}"
+"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":%url_key=pants-women,url_key=pants-men%,""is_value_processed"":false}]}","{""type"":""Magento\\CatalogRule\\Model\\Rule\\Action\\Collection"",""attribute"":null,""operator"":""="",""value"":null}"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`name,description,simple_action,discount_amount,is_active,conditions_serialized,actions_serialized`
`2`		-"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":""is_value_processed"",""0"":false}]}","{""type"":""Magento\\CatalogRule\\Model\\Rule\\Action\\Collection"",""attribute"":null,""operator"":""="",""value"":null}"
	`2`	+"20% off all Women’s and Men’s Pants","20% off all Women’s and Men’s Pants","by_percent",20,1,"{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Combine"",""attribute"":null,""operator"":null,""value"":""1"",""is_value_processed"":null,""aggregator"":""all"",""conditions"":[{""type"":""Magento\\CatalogRule\\Model\\Rule\\Condition\\Product"",""attribute"":""category_ids"",""operator"":""()"",""value"":%url_key=pants-women,url_key=pants-men%,""is_value_processed"":false}]}","{""type"":""Magento\\CatalogRule\\Model\\Rule\\Action\\Collection"",""attribute"":null,""operator"":""="",""value"":null}"