| commit | 0e7a1c8326174b172935ce81f51db750073f788a | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Jun 01 22:35:34 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jun 01 22:35:34 2017 +0000 |
| tree | 4bebfff771106b6d8c5c7d28b2fe0084a35966f5 | |
| parent | 2f6cdffec6755cc7b8f82a5618106181c704a57c [diff] | |
| parent | d1f434a453d91741a14369d080dc65e6e38530fe [diff] |
Merge "Extend job list when inheriting jobs" into feature/zuulv3
diff --git a/zuul/model.py b/zuul/model.py index bfd4d76..30bcb9b 100644 --- a/zuul/model.py +++ b/zuul/model.py
@@ -929,7 +929,7 @@ def inheritFrom(self, other): for jobname, jobs in other.jobs.items(): if jobname in self.jobs: - self.jobs[jobname].append(jobs) + self.jobs[jobname].extend(jobs) else: self.jobs[jobname] = jobs