Joshua Hesketh 0aa7e8bdbf Merge branch 'master' into v3_merge
Includes minor py3 fixes (for pep8 on py3).

 Conflicts:
	tests/base.py
	tests/test_model.py
	tests/test_scheduler.py
	tox.ini
	zuul/model.py
	zuul/reporter/__init__.py
	zuul/scheduler.py
	zuul/source/gerrit.py

Change-Id: I99daf9acd746767967b42396881a2dff82134a07
2016-07-14 22:36:59 +10:00
..
2015-09-04 18:28:59 +00:00
2012-08-23 23:20:09 +00:00
2016-07-14 22:36:59 +10:00
2015-01-05 14:56:54 -08:00
2015-12-06 14:48:31 +11:00