From 94a7dc21e7321b7bb25d20cfa06058d57448ed66 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 10 Jul 2013 18:39:23 +0000 Subject: [PATCH] Enable merge commits for swift-milestone members. The openstack/swift (and potentially openstack/python-swiftclient) projects will be making use of feature branches, so grant the swift-milestone group permission to upload merge commits for review. Also make gerritbot report changes for feature/ec on the same channels as swift master. Change-Id: I3c86caf3715428f18fa0ee36f1cbc01f0627e188 Reviewed-on: https://review.openstack.org/36526 Reviewed-by: Khai Do Reviewed-by: James E. Blair Reviewed-by: John Dickinson Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/gerritbot/files/gerritbot_channel_config.yaml | 2 ++ .../files/gerrit/acls/openstack/python-swiftclient.config | 2 ++ .../openstack_project/files/gerrit/acls/openstack/swift.config | 2 ++ 3 files changed, 6 insertions(+) diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index 8b644df09b..e61d93ff59 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -67,6 +67,7 @@ openstack-dev: - openstack-infra/devstack-gate branches: - master + - feature/ec openstack-doc: events: @@ -293,6 +294,7 @@ openstack-swift: - openstack/python-swiftclient branches: - master + - feature/ec openstack-state-management: events: diff --git a/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config b/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config index b5ff25943f..d205888e8d 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config @@ -1,3 +1,5 @@ +[access "refs/for/refs/*"] + pushMerge = group swift-milestone [access "refs/heads/*"] label-Code-Review = -2..+2 group swift-core label-Approved = +0..+1 group swift-core diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift.config b/modules/openstack_project/files/gerrit/acls/openstack/swift.config index 704c933e42..8fd16cf479 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack/swift.config +++ b/modules/openstack_project/files/gerrit/acls/openstack/swift.config @@ -1,3 +1,5 @@ +[access "refs/for/refs/*"] + pushMerge = group swift-milestone [access "refs/heads/*"] label-Code-Review = -2..+2 group swift-core label-Approved = +0..+1 group swift-core