[EngCom] Public Pull Requests - 2.2-develop

- merged latest code from mainline branch
comdiler · Jun 13, 2018 · b73e89c · b73e89c
2 parents aefe8be + 8f80bd6
commit b73e89c
Show file tree

Hide file tree

Showing 6 changed files with 1,852 additions and 954 deletions.
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
diff --git a/setup/performance-toolkit/profiles/ce/extra_large.xml b/setup/performance-toolkit/profiles/ce/extra_large.xml
@@ -23,6 +23,9 @@
                     <attribute>
                         <options>8</options>
                     </attribute>
+                    <attribute>
+                        <options>5</options>
+                    </attribute>
                 </attributes>
                 <sku>Configurable Product %s</sku>
                 <products>16000</products>

diff --git a/setup/performance-toolkit/profiles/ce/large.xml b/setup/performance-toolkit/profiles/ce/large.xml
@@ -23,6 +23,9 @@
                     <attribute>
                         <options>8</options>
                     </attribute>
+                    <attribute>
+                        <options>5</options>
+                    </attribute>
                 </attributes>
                 <sku>Configurable Product %s</sku>
                 <products>8000</products>

diff --git a/setup/performance-toolkit/profiles/ce/medium.xml b/setup/performance-toolkit/profiles/ce/medium.xml
@@ -23,6 +23,9 @@
                     <attribute>
                         <options>8</options>
                     </attribute>
+                    <attribute>
+                        <options>5</options>
+                    </attribute>
                 </attributes>
                 <sku>Configurable Product %s</sku>
                 <products>640</products>

diff --git a/setup/performance-toolkit/profiles/ce/medium_msite.xml b/setup/performance-toolkit/profiles/ce/medium_msite.xml
@@ -23,6 +23,9 @@
                     <attribute>
                         <options>8</options>
                     </attribute>
+                    <attribute>
+                        <options>5</options>
+                    </attribute>
                 </attributes>
                 <sku>Configurable Product %s</sku>
                 <products>800</products>

diff --git a/setup/performance-toolkit/profiles/ce/small.xml b/setup/performance-toolkit/profiles/ce/small.xml
@@ -23,6 +23,9 @@
                     <attribute>
                         <options>8</options>
                     </attribute>
+                    <attribute>
+                        <options>5</options>
+                    </attribute>
                 </attributes>
                 <sku>Configurable Product %s</sku>
                 <products>16</products>