| commit | dc7820cf885c3791da3dc84bf2733e0da9238e5b | [log] [tgz] |
|---|---|---|
| author | Joshua Hesketh <josh@nitrotech.org> | Fri Mar 11 13:14:28 2016 +1100 |
| committer | Joshua Hesketh <josh@nitrotech.org> | Fri Mar 11 13:24:00 2016 +1100 |
| tree | 4f886afd083d3a22e2f3a6b54cd3a1e8d9ff2ff7 | |
| parent | c38a278a52eb48ec8e0dbea9e41137cdabd7b5b7 [diff] | |
| parent | 87a801fb1dbff9657c9fe6e4b65157d26f902fb5 [diff] |
Merge branch 'master' into feature/zuulv3 Conflicts: zuul/model.py zuul/scheduler.py Change-Id: I2973bfae65b3658549dc13aa3ea0efe60669ba8e