Michael DeHaan 5336316f2e Resolve merge conflicts.

2013-04-17 20:35:01 -04:00

..

management

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

migrations

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

models

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

tests

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

__init__.py

Just use plain GPL.

2013-04-09 01:05:55 -04:00

admin.py

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

base_views.py

Added /api/v1/groups/N/hosts and /api/v1/groups/N/all_hosts/

2013-04-16 17:41:20 -04:00

rbac.py

Just use plain GPL.

2013-04-09 01:05:55 -04:00

serializers.py

Just use plain GPL.

2013-04-09 01:05:55 -04:00

tasks.py

Renamed LaunchJob to JobTemplate, LaunchJobStatus to Job, LaunchJobHostSummary to JobHostSummary, and LaunchJobStatusEvent to JobEvent. Updated admin, celery task, management commands accordingly.

2013-04-17 18:59:21 -04:00

views.py

Resolve merge conflicts.

2013-04-17 20:35:01 -04:00