From f589f2e3529b77f78777ed140946dad4268302b8 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 28 Apr 2014 16:57:51 -0700 Subject: [PATCH] Actually disable trivial_rebase_hook The test in the erb file was bogus. Change-Id: I9790f9f7bb25f105d9875a34f0451ef373f61dca --- modules/openstack_project/templates/gerrit_patchset-created.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openstack_project/templates/gerrit_patchset-created.erb b/modules/openstack_project/templates/gerrit_patchset-created.erb index 18079de718..ffd02f0417 100755 --- a/modules/openstack_project/templates/gerrit_patchset-created.erb +++ b/modules/openstack_project/templates/gerrit_patchset-created.erb @@ -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 \