shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

Revert "enforce JT/Job.timeout >= 0"

Browse Source 
This reverts commit 1fb41cf8d0.
This commit is contained in:
Ryan Petrello 2018-07-10 15:06:13 -04:00
parent 68ceaadf8d
commit acd045379c
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
awx/main/migrations/0043_v330_job_timeout_enforce_positive_integer.py
View File

@ -1,27 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.11 on 2018-07-09 21:07
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('main', '0042_v330_org_member_role_deparent'),
]
operations = [
migrations.AlterField(
model_name='job',
name='timeout',
field=models.PositiveIntegerField(blank=True, default=0, help_text='The amount of time (in seconds) to run before the task is canceled.'),
),
migrations.AlterField(
model_name='jobtemplate',
name='timeout',
field=models.PositiveIntegerField(blank=True, default=0, help_text='The amount of time (in seconds) to run before the task is canceled.'),
),
]

2
awx/main/models/jobs.py
View File

@ -134,7 +134,7 @@ class JobOptions(BaseModel):
allow_simultaneous = models.BooleanField(
default=False,
)
timeout = models.PositiveIntegerField(
timeout = models.IntegerField(
blank=True,
default=0,
help_text=_("The amount of time (in seconds) to run before the task is canceled."),