tree 247957980166a5198fc14b1c0f9b27d0b12f9e79
parent 8ced56344e816e94db66835055311d985f0bb620
parent 5e729e911924458ba76ce3acad0c991534f8bc01
author Jenkins <jenkins@review.openstack.org> 1488560827 +0000
committer Gerrit Code Review <review@openstack.org> 1488560827 +0000

Merge "Re-enable test_timer" into feature/zuulv3