Joshua Hesketh 89b67f617c Merge master into feature/zuulv3 ... Conflicts: zuul/connection/gerrit.py zuul/lib/connections.py zuul/model.py zuul/scheduler.py Change-Id: If1c8ac3bf26bd8c4496ac130958b966d9937519e		2016-02-12 14:10:03 +11:00
..
__init__.py	Merge master into feature/zuulv3	2016-02-12 14:10:03 +11:00
dependent.py	Add job inheritance and start refactoring	2015-12-15 15:56:45 -08:00
independent.py	Add job inheritance and start refactoring	2015-12-15 15:56:45 -08:00