Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt

awx/main/migrations/0037_job_allow_simultaneous.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0036_v310_remove_tower_settings'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='job',
+            name='allow_simultaneous',
+            field=models.BooleanField(default=False),
+        ),
+    ]

awx/main/migrations/0038_v310_workflow_rbac_prompts.py

@@ -10,7 +10,7 @@ import awx.main.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0036_v310_remove_tower_settings'),
+        ('main', '0037_job_allow_simultaneous'),
     ]
 
     operations = [