External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-01 10:29:56 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Akita Noek
2016-03-31 11:32:02 -04:00
parent 2de83e63c3 359da2d958
commit 219c09728d
79 changed files with 4285 additions and 2283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ class AdHocCommand(UnifiedJob):
job_type = models.CharField(
max_length=64,
choices=JOB_TYPE_CHOICES,
choices=AD_HOC_JOB_TYPE_CHOICES,
default='run',
)
inventory = models.ForeignKey(