MAGETWO-71255: Merge 2.2 into develop mainline (2.3)

cpartica · cpartica · commit 0a1d85c24f20 · 2017-08-01T16:35:22.000-05:00
- stabilize builds
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
@@ -233,7 +233,7 @@ public function provideUniqueData()
                         "option_1" => "",
                         "option_2" => "",
                     ]
-                ], true
+                ], false
             ],
             'duplicate and deleted' => [
                 [
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
@@ -40,7 +40,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
 {
     /**
      * Mail object
-     * 
+     *
      * @deprecated Unused property
      *
      */

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public function provideUniqueData()`
`233`	`233`	`"option_1" => "",`
`234`	`234`	`"option_2" => "",`
`235`	`235`	`]`
`236`		`- ], true`
	`236`	`+ ], false`
`237`	`237`	`],`
`238`	`238`	`'duplicate and deleted' => [`
`239`	`239`	`[`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate`
`40`	`40`	`{`
`41`	`41`	`/**`
`42`	`42`	`* Mail object`
`43`		`- *`
	`43`	`+ *`
`44`	`44`	`* @deprecated Unused property`
`45`	`45`	`*`
`46`	`46`	`*/`