From 4bf53d27580f1f85b654482ecbc6d4b1a7118d09 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 10 Dec 2014 20:47:05 +0100 Subject: [PATCH] Normalize Gerrit ACLs This is the result of running: find gerrit/acls/ -type f -name "*.config" \ -exec ./tools/normalize_acl.py {} 1 2 3 4 5 6 \; Change-Id: Ic281a233aae06b27096d315831e45bb3499a95fb --- gerrit/acls/openstack-dev/devstack.config | 2 +- gerrit/acls/openstack/cinder.config | 2 +- gerrit/acls/openstack/horizon.config | 2 +- gerrit/acls/openstack/neutron.config | 2 +- gerrit/acls/openstack/nova.config | 2 +- gerrit/acls/openstack/oslo.vmware.config | 2 +- gerrit/acls/openstack/python-saharaclient.config | 2 +- gerrit/acls/openstack/python-troveclient.config | 2 +- gerrit/acls/openstack/sahara.config | 2 +- gerrit/acls/openstack/tempest.config | 2 +- gerrit/acls/openstack/trove-integration.config | 2 +- gerrit/acls/openstack/trove.config | 2 +- gerrit/acls/stackforge/chef-cookbooks.config | 2 +- gerrit/acls/stackforge/compass.config | 2 +- gerrit/acls/stackforge/congress.config | 2 +- gerrit/acls/stackforge/ec2-driver.config | 2 +- gerrit/acls/stackforge/fuel.config | 2 +- gerrit/acls/stackforge/murano.config | 2 +- gerrit/acls/stackforge/os-ansible-deployment.config | 10 +++++----- gerrit/acls/stackforge/powervc-driver.config | 2 +- gerrit/acls/stackforge/puppet-ceph.config | 2 +- gerrit/acls/stackforge/puppet-openstack-cloud.config | 4 ++-- gerrit/acls/stackforge/xenapi-os-testing.config | 2 +- gerrit/acls/stackforge/yaql.config | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gerrit/acls/openstack-dev/devstack.config b/gerrit/acls/openstack-dev/devstack.config index 89f7e2bcc8..3661afd201 100644 --- a/gerrit/acls/openstack-dev/devstack.config +++ b/gerrit/acls/openstack-dev/devstack.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group devstack-core label-Code-Review = -2..+2 group devstack-core -label-Workflow = -1..+1 group devstack-core label-Verified = -1..+1 group devstack-ci +label-Workflow = -1..+1 group devstack-core [access "refs/heads/stable/*"] abandon = group devstack-core diff --git a/gerrit/acls/openstack/cinder.config b/gerrit/acls/openstack/cinder.config index 58002ad302..1ed6546a6d 100644 --- a/gerrit/acls/openstack/cinder.config +++ b/gerrit/acls/openstack/cinder.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group cinder-core label-Code-Review = -2..+2 group cinder-core -label-Workflow = -1..+1 group cinder-core label-Verified = -1..+1 group cinder-ci +label-Workflow = -1..+1 group cinder-core [access "refs/heads/proposed/*"] abandon = group cinder-milestone diff --git a/gerrit/acls/openstack/horizon.config b/gerrit/acls/openstack/horizon.config index 1ba44ebc54..7170216e8b 100644 --- a/gerrit/acls/openstack/horizon.config +++ b/gerrit/acls/openstack/horizon.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group horizon-core label-Code-Review = -2..+2 group horizon-core -label-Workflow = -1..+1 group horizon-core label-Verified = -1..+1 group horizon-ci +label-Workflow = -1..+1 group horizon-core [access "refs/heads/proposed/*"] abandon = group horizon-milestone diff --git a/gerrit/acls/openstack/neutron.config b/gerrit/acls/openstack/neutron.config index dd71c86a63..96f690b189 100644 --- a/gerrit/acls/openstack/neutron.config +++ b/gerrit/acls/openstack/neutron.config @@ -4,8 +4,8 @@ pushMerge = group neutron-milestone [access "refs/heads/*"] abandon = group neutron-core label-Code-Review = -2..+2 group neutron-core -label-Workflow = -1..+1 group neutron-core label-Verified = -1..+1 group neutron-ci +label-Workflow = -1..+1 group neutron-core [access "refs/heads/proposed/*"] abandon = group neutron-milestone diff --git a/gerrit/acls/openstack/nova.config b/gerrit/acls/openstack/nova.config index bd051f2f39..441e9fb296 100644 --- a/gerrit/acls/openstack/nova.config +++ b/gerrit/acls/openstack/nova.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group nova-core label-Code-Review = -2..+2 group nova-core -label-Workflow = -1..+1 group nova-core label-Verified = -1..+1 group nova-ci +label-Workflow = -1..+1 group nova-core rebase = group nova-core [access "refs/heads/proposed/*"] diff --git a/gerrit/acls/openstack/oslo.vmware.config b/gerrit/acls/openstack/oslo.vmware.config index fc118cf14c..0206a7e358 100644 --- a/gerrit/acls/openstack/oslo.vmware.config +++ b/gerrit/acls/openstack/oslo.vmware.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group oslo-vmware-core label-Code-Review = -2..+2 group oslo-vmware-core -label-Workflow = -1..+1 group oslo-vmware-core label-Verified = -1..+1 group oslo-vmware-ci +label-Workflow = -1..+1 group oslo-vmware-core [access "refs/tags/*"] pushSignedTag = group oslo-vmware-release diff --git a/gerrit/acls/openstack/python-saharaclient.config b/gerrit/acls/openstack/python-saharaclient.config index 00ae2ca654..3784e1e50c 100644 --- a/gerrit/acls/openstack/python-saharaclient.config +++ b/gerrit/acls/openstack/python-saharaclient.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group sahara-core label-Code-Review = -2..+2 group sahara-core -label-Workflow = -1..+1 group sahara-core label-Verified = -1..+1 group sahara-ci +label-Workflow = -1..+1 group sahara-core [access "refs/tags/*"] pushSignedTag = group sahara-release diff --git a/gerrit/acls/openstack/python-troveclient.config b/gerrit/acls/openstack/python-troveclient.config index bed2ef12f6..6142597590 100644 --- a/gerrit/acls/openstack/python-troveclient.config +++ b/gerrit/acls/openstack/python-troveclient.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group trove-core label-Code-Review = -2..+2 group trove-core -label-Workflow = -1..+1 group trove-core label-Verified = -1..+1 group trove-ci +label-Workflow = -1..+1 group trove-core [access "refs/heads/proposed/*"] abandon = group trove-milestone diff --git a/gerrit/acls/openstack/sahara.config b/gerrit/acls/openstack/sahara.config index 79b9172883..266bc3f37e 100644 --- a/gerrit/acls/openstack/sahara.config +++ b/gerrit/acls/openstack/sahara.config @@ -4,8 +4,8 @@ pushSignedTag = group sahara-release [access "refs/heads/*"] abandon = group sahara-core label-Code-Review = -2..+2 group sahara-core -label-Workflow = -1..+1 group sahara-core label-Verified = -1..+1 group sahara-ci +label-Workflow = -1..+1 group sahara-core rebase = group sahara-core [access "refs/heads/proposed/*"] diff --git a/gerrit/acls/openstack/tempest.config b/gerrit/acls/openstack/tempest.config index e14895e8e4..6163fc972b 100644 --- a/gerrit/acls/openstack/tempest.config +++ b/gerrit/acls/openstack/tempest.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group tempest-core label-Code-Review = -2..+2 group tempest-core -label-Workflow = -1..+1 group tempest-core label-Verified = -1..+1 group tempest-ci +label-Workflow = -1..+1 group tempest-core [access "refs/heads/stable/*"] abandon = group tempest-core diff --git a/gerrit/acls/openstack/trove-integration.config b/gerrit/acls/openstack/trove-integration.config index 52ec6f98be..a3cf093e61 100644 --- a/gerrit/acls/openstack/trove-integration.config +++ b/gerrit/acls/openstack/trove-integration.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group trove-core label-Code-Review = -2..+2 group trove-core -label-Workflow = -1..+1 group trove-core label-Verified = -1..+1 group trove-ci +label-Workflow = -1..+1 group trove-core [access "refs/heads/proposed/*"] abandon = group trove-milestone diff --git a/gerrit/acls/openstack/trove.config b/gerrit/acls/openstack/trove.config index 52ec6f98be..a3cf093e61 100644 --- a/gerrit/acls/openstack/trove.config +++ b/gerrit/acls/openstack/trove.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group trove-core label-Code-Review = -2..+2 group trove-core -label-Workflow = -1..+1 group trove-core label-Verified = -1..+1 group trove-ci +label-Workflow = -1..+1 group trove-core [access "refs/heads/proposed/*"] abandon = group trove-milestone diff --git a/gerrit/acls/stackforge/chef-cookbooks.config b/gerrit/acls/stackforge/chef-cookbooks.config index 67d7f1fb42..1a55dae982 100644 --- a/gerrit/acls/stackforge/chef-cookbooks.config +++ b/gerrit/acls/stackforge/chef-cookbooks.config @@ -2,8 +2,8 @@ abandon = group chef-manager-core create = group chef-manager-core label-Code-Review = -2..+2 group chef-manager-core -label-Workflow = -1..+1 group chef-manager-core label-Verified = -1..+1 group chef-ci +label-Workflow = -1..+1 group chef-manager-core [access "refs/heads/stable/*"] abandon = group chef-manager-core diff --git a/gerrit/acls/stackforge/compass.config b/gerrit/acls/stackforge/compass.config index f275b26894..596acf2434 100644 --- a/gerrit/acls/stackforge/compass.config +++ b/gerrit/acls/stackforge/compass.config @@ -4,8 +4,8 @@ pushMerge = group compass-core [access "refs/heads/*"] abandon = group compass-core label-Code-Review = -2..+2 group compass-core -label-Workflow = -1..+1 group compass-core label-Verified = -1..+1 group compass-ci +label-Workflow = -1..+1 group compass-core [access "refs/heads/dev/*"] create = group compass-core diff --git a/gerrit/acls/stackforge/congress.config b/gerrit/acls/stackforge/congress.config index c272377e10..71bbdcacdd 100644 --- a/gerrit/acls/stackforge/congress.config +++ b/gerrit/acls/stackforge/congress.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group congress-core label-Code-Review = -2..+2 group congress-core -label-Workflow = -1..+1 group congress-core label-Verified = -1..+1 group congress-ci +label-Workflow = -1..+1 group congress-core [access "refs/tags/*"] pushSignedTag = group congress-release diff --git a/gerrit/acls/stackforge/ec2-driver.config b/gerrit/acls/stackforge/ec2-driver.config index dacd7cd082..b36cf8d56b 100644 --- a/gerrit/acls/stackforge/ec2-driver.config +++ b/gerrit/acls/stackforge/ec2-driver.config @@ -11,4 +11,4 @@ requireChangeId = true requireContributorAgreement = true [submit] -mergeContent = true \ No newline at end of file +mergeContent = true diff --git a/gerrit/acls/stackforge/fuel.config b/gerrit/acls/stackforge/fuel.config index 6ba4174247..e620b4af49 100644 --- a/gerrit/acls/stackforge/fuel.config +++ b/gerrit/acls/stackforge/fuel.config @@ -2,8 +2,8 @@ abandon = group fuel-core create = group fuel-core label-Code-Review = -2..+2 group fuel-core -label-Workflow = -1..+1 group fuel-core label-Verified = -1..+1 group fuel-ci +label-Workflow = -1..+1 group fuel-core [access "refs/heads/stable/*"] abandon = group fuel-core diff --git a/gerrit/acls/stackforge/murano.config b/gerrit/acls/stackforge/murano.config index 03574d3220..010c143f33 100644 --- a/gerrit/acls/stackforge/murano.config +++ b/gerrit/acls/stackforge/murano.config @@ -2,8 +2,8 @@ abandon = group murano-core create = group murano-release label-Code-Review = -2..+2 group murano-core -label-Workflow = -1..+1 group murano-core label-Verified = -1..+1 group murano-ci +label-Workflow = -1..+1 group murano-core [access "refs/heads/proposed/*"] abandon = group murano-milestone diff --git a/gerrit/acls/stackforge/os-ansible-deployment.config b/gerrit/acls/stackforge/os-ansible-deployment.config index f2df77d634..6c60d67a16 100644 --- a/gerrit/acls/stackforge/os-ansible-deployment.config +++ b/gerrit/acls/stackforge/os-ansible-deployment.config @@ -1,22 +1,22 @@ [access "refs/heads/*"] abandon = group os-ansible-deployment-core +create = group os-ansible-deployment-release label-Code-Review = -2..+2 group os-ansible-deployment-core label-Workflow = -1..+1 group os-ansible-deployment-core -create = group os-ansible-deployment-release [access "refs/heads/proposed/*"] abandon = group os-ansible-deployment-core exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group os-ansible-deployment-core +label-Code-Review = -2..+2 group os-ansible-deployment-core label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+1 group os-ansible-deployment-core +label-Workflow = -1..+1 group os-ansible-deployment-core [access "refs/heads/stable/*"] abandon = group os-ansible-deployment-core exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group os-ansible-deployment-core +label-Code-Review = -2..+2 group os-ansible-deployment-core label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+1 group os-ansible-deployment-core +label-Workflow = -1..+1 group os-ansible-deployment-core [access "refs/tags/*"] pushSignedTag = group os-ansible-deployment-release diff --git a/gerrit/acls/stackforge/powervc-driver.config b/gerrit/acls/stackforge/powervc-driver.config index 500b7565ae..52e23014e2 100644 --- a/gerrit/acls/stackforge/powervc-driver.config +++ b/gerrit/acls/stackforge/powervc-driver.config @@ -2,8 +2,8 @@ abandon = group powervc-driver-core create = group powervc-driver-core label-Code-Review = -2..+2 group powervc-driver-core -label-Workflow = -1..+1 group powervc-driver-core label-Verified = -1..+1 group powervc-driver-ci +label-Workflow = -1..+1 group powervc-driver-core [access "refs/heads/stable/*"] abandon = group powervc-driver-core diff --git a/gerrit/acls/stackforge/puppet-ceph.config b/gerrit/acls/stackforge/puppet-ceph.config index 5bf8d292ed..c2cb0a5743 100644 --- a/gerrit/acls/stackforge/puppet-ceph.config +++ b/gerrit/acls/stackforge/puppet-ceph.config @@ -2,8 +2,8 @@ abandon = group puppet-ceph-core create = group puppet-ceph-core label-Code-Review = -2..+2 group puppet-ceph-core -label-Workflow = -1..+1 group puppet-ceph-core label-Verified = -1..+1 group puppet-ceph-ci +label-Workflow = -1..+1 group puppet-ceph-core [access "refs/tags/*"] pushSignedTag = group puppet-ceph-core diff --git a/gerrit/acls/stackforge/puppet-openstack-cloud.config b/gerrit/acls/stackforge/puppet-openstack-cloud.config index 56e2093441..de6fc53f3f 100644 --- a/gerrit/acls/stackforge/puppet-openstack-cloud.config +++ b/gerrit/acls/stackforge/puppet-openstack-cloud.config @@ -1,6 +1,6 @@ [access "refs/heads/*"] -create = group puppet-openstack-cloud-core abandon = group puppet-openstack-cloud-core +create = group puppet-openstack-cloud-core label-Code-Review = -2..+2 group puppet-openstack-cloud-core label-Workflow = -1..+1 group puppet-openstack-cloud-core @@ -8,8 +8,8 @@ label-Workflow = -1..+1 group puppet-openstack-cloud-core abandon = group puppet-openstack-cloud-core exclusiveGroupPermissions = abandon label-Code-Review label-Workflow label-Code-Review = -2..+2 group puppet-openstack-cloud-core -label-Workflow = -1..+1 group puppet-openstack-cloud-core label-Code-Review = -1..+1 group Registered Users +label-Workflow = -1..+1 group puppet-openstack-cloud-core [access "refs/tags/*"] pushSignedTag = group puppet-openstack-cloud-core diff --git a/gerrit/acls/stackforge/xenapi-os-testing.config b/gerrit/acls/stackforge/xenapi-os-testing.config index 56422f5f4e..cf2bda48d4 100644 --- a/gerrit/acls/stackforge/xenapi-os-testing.config +++ b/gerrit/acls/stackforge/xenapi-os-testing.config @@ -1,8 +1,8 @@ [access "refs/heads/*"] abandon = group xenapi-os-testing-core label-Code-Review = -2..+2 group xenapi-os-testing-core -label-Workflow = -1..+1 group xenapi-os-testing-core label-Verified = -1..+1 group xenapi-os-testing-ci +label-Workflow = -1..+1 group xenapi-os-testing-core [access "refs/tags/*"] pushSignedTag = group xenapi-os-testing-release diff --git a/gerrit/acls/stackforge/yaql.config b/gerrit/acls/stackforge/yaql.config index 55fdffd4f8..497551e4b0 100644 --- a/gerrit/acls/stackforge/yaql.config +++ b/gerrit/acls/stackforge/yaql.config @@ -11,4 +11,4 @@ requireChangeId = true requireContributorAgreement = true [submit] -mergeContent = true \ No newline at end of file +mergeContent = true