From 03df77212b22969f98f639b2865c0cd5753db16e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 15 May 2013 08:56:47 -0700 Subject: [PATCH] Allow merge commits in zuul. It has a feature branch. Change-Id: I9141df6974520a15c79fda66f82b8ca25c768327 Reviewed-on: https://review.openstack.org/29254 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- .../files/gerrit/acls/openstack-infra/zuul.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config b/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config index c683a83572..8449409d7c 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config @@ -1,3 +1,5 @@ +[access "refs/for/refs/*"] + pushMerge = group openstack-ci-core [access "refs/heads/*"] label-Code-Review = -2..+2 group openstack-ci-core label-Approved = +0..+1 group openstack-ci-core