External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 00:08:44 -03:30
Code Issues Packages Projects Releases Wiki Activity

Solve rebase conflicts.

Browse Source
This commit is contained in:
Aaron Tan
2016-10-17 17:08:05 -04:00
parent 21feae7c11
commit c595492950
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0036_v310_job_timeout.py → awx/main/migrations/0041_v310_job_timeout.py
View File

@@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0035_v310_jobevent_uuid'),
('main', '0040_v310_artifacts'),
]
operations = [

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

@@ -257,11 +257,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
'playbook', 'credential', 'cloud_credential', 'network_credential', 'forks', 'schedule',
'limit', 'verbosity', 'job_tags', 'extra_vars', 'launch_type',
'force_handlers', 'skip_tags', 'start_at_task', 'become_enabled',
<<<<<<< 887818cb8987d465e23f1ed0c5886473acdbfcda
'labels', 'survey_passwords', 'allow_simultaneous',]
=======
'labels', 'survey_passwords', 'timeout']
>>>>>>> Implement timeout on job/job-template.
'labels', 'survey_passwords', 'allow_simultaneous', 'timeout']
def resource_validation_data(self):
'''