Skip to content

Commit bab64fc

Browse files
committed
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr35
2 parents 223e72c + 45a7e0c commit bab64fc

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@
568568
<settings>
569569
<scopeLabel>[GLOBAL]</scopeLabel>
570570
<validation>
571-
<rule name="validate-digits" xsi:type="boolean">true</rule>
571+
<rule name="validate-integer" xsi:type="boolean">true</rule>
572572
<rule name="validate-number" xsi:type="boolean">true</rule>
573573
</validation>
574574
<label translate="true">Qty Increments</label>

app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ define([
2020
var isDigits = value !== 1;
2121

2222
this.validation['validate-integer'] = isDigits;
23-
this.validation['validate-digits'] = isDigits;
2423
this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
2524
this.validate();
2625
}

app/code/Magento/Cron/etc/cron_groups.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<schedule_ahead_for>20</schedule_ahead_for>
1212
<schedule_lifetime>15</schedule_lifetime>
1313
<history_cleanup_every>10</history_cleanup_every>
14-
<history_success_lifetime>10080</history_success_lifetime>
15-
<history_failure_lifetime>10080</history_failure_lifetime>
14+
<history_success_lifetime>60</history_success_lifetime>
15+
<history_failure_lifetime>4320</history_failure_lifetime>
1616
<use_separate_process>0</use_separate_process>
1717
</group>
1818
</config>

app/code/Magento/Indexer/etc/cron_groups.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<schedule_ahead_for>4</schedule_ahead_for>
1212
<schedule_lifetime>2</schedule_lifetime>
1313
<history_cleanup_every>10</history_cleanup_every>
14-
<history_success_lifetime>10080</history_success_lifetime>
15-
<history_failure_lifetime>10080</history_failure_lifetime>
14+
<history_success_lifetime>60</history_success_lifetime>
15+
<history_failure_lifetime>4320</history_failure_lifetime>
1616
<use_separate_process>1</use_separate_process>
1717
</group>
1818
</config>

0 commit comments

Comments
 (0)