Merge "Actually disable trivial_rebase_hook"

This commit is contained in:
Jenkins 2014-04-29 00:21:04 +00:00 committed by Gerrit Code Review
commit 42feb57dd0

View File

@ -4,7 +4,7 @@
timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
<% if trivial_rebase_role_id -%>
<% if @trivial_rebase_role_id != "" -%>
timeout -k 2m 10m /usr/local/bin/trivial-rebase \
patchset-created \
--whitespace \