tree d9ad93864dae1f764dc2386794492f8cab7ac2c7
parent 65d793acb6cf61d0820bcf4777fccd354712104f
parent 923b30d9e41ffde8699a19c0b8258cdb4a5de01f
author Jenkins <jenkins@review.openstack.org> 1394576684 +0000
committer Gerrit Code Review <review@openstack.org> 1394576684 +0000

Merge "Make zuul-merger default pidfile match init script"