diff --git a/awx/main/migrations/0043_v330_job_timeout_enforce_positive_integer.py b/awx/main/migrations/0043_v330_job_timeout_enforce_positive_integer.py deleted file mode 100644 index 4c359e888b..0000000000 --- a/awx/main/migrations/0043_v330_job_timeout_enforce_positive_integer.py +++ /dev/null @@ -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.'), - ), - ] diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 0c7fd4cf2f..532dca10b4 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -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."),