tree 6ead198fed5bd166808d1803f7d5022d80baa3e1
parent afb9b2039ce366cc096bcea5b908cfc9181e6f6b
parent f760f0e49f0d45291afc6e5bee0041e87b17e865
author Joshua Hesketh <josh@nitrotech.org> 1455186134 +1100
committer Joshua Hesketh <josh@nitrotech.org> 1455246603 +1100

Merge master into feature/zuulv3

Conflicts:
	zuul/connection/gerrit.py
	zuul/lib/connections.py
	zuul/model.py
	zuul/scheduler.py

Change-Id: If1c8ac3bf26bd8c4496ac130958b966d9937519e