| commit | 0aa7e8bdbf99b6da00ed6dcb17256c131386e5c3 | [log] [tgz] |
|---|---|---|
| author | Joshua Hesketh <josh@nitrotech.org> | Thu Jul 14 00:12:25 2016 +1000 |
| committer | Joshua Hesketh <josh@nitrotech.org> | Thu Jul 14 22:36:59 2016 +1000 |
| tree | 814d7136044ff78e56f3737b15b59544f3e32425 | |
| parent | bfa945a579a51317f773e136e9b81edd92993fba [diff] | |
| parent | c19d3d9eff8921d7a76abd58729a3acb08d3e1e5 [diff] |
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