Merge branch 'remove_jobevent_parent_usage' into release_3.1.0

* remove_jobevent_parent_usage:
  Don't iterate over parents, perform a final update at the end
  Drop assignment of job event parent in favor of parent_uuid
This commit is contained in:
Matthew Jones
2017-01-24 21:07:58 -05:00
3 changed files with 30 additions and 76 deletions

View File

@@ -2503,8 +2503,8 @@ class JobEventSerializer(BaseSerializer):
model = JobEvent
fields = ('*', '-name', '-description', 'job', 'event', 'counter',
'event_display', 'event_data', 'event_level', 'failed',
'changed', 'uuid', 'host', 'host_name', 'parent', 'playbook',
'play', 'task', 'role', 'stdout', 'start_line', 'end_line',
'changed', 'uuid', 'parent_uuid', 'host', 'host_name', 'parent',
'playbook', 'play', 'task', 'role', 'stdout', 'start_line', 'end_line',
'verbosity')
def get_related(self, obj):