Normalize ACL files.

Sorted section names, no tabs.

Change-Id: I929b3ef6a622cf72287db23c200a0b9f379c1d35
Reviewed-on: https://review.openstack.org/16093
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

modules/openstack_project/files/gerrit/acls/heat-api/heat.config

@@ -1,12 +1,11 @@
-[project]
-	state = active
-[receive]
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group heat
+        create = group heat
-	pushTag = group heat
+        pushTag = group heat
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group heat
+        label-Approved = +0..+1 group heat
-	label-Code-Review = -2..+2 group heat
+        label-Code-Review = -2..+2 group heat
+[project]
+        state = active
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/heat-api/python-heatclient.config

@@ -1,12 +1,11 @@
-[project]
-	state = active
-[receive]
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group heat
+        create = group heat
-	pushTag = group heat
+        pushTag = group heat
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group heat
+        label-Approved = +0..+1 group heat
-	label-Code-Review = -2..+2 group heat
+        label-Code-Review = -2..+2 group heat
+[project]
+        state = active
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/devstack-gate.config

@@ -1,11 +1,11 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
 [receive]
-	requireChangeId = true
+        requireChangeId = true
-	requireShortMessage = true
+        requireShortMessage = true
-	requireContributorAgreement = true
+        requireContributorAgreement = true
 [submit]
-	mergeContent = true
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit-verification-status-plugin.config

@@ -1,11 +1,11 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
-[access "refs/heads/*"]
-	label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
+[access "refs/heads/*"]
+        label-Approved = +0..+1 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit.config

@@ -1,21 +1,21 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	pushTag = group openstack-ci-core
+        pushTag = group openstack-ci-core
-	create = group openstack-ci-core
+        create = group openstack-ci-core
-[access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-core
-	label-Approved = +0..+1 group openstack-ci-core
-	forgeAuthor = group openstack-ci-admins
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
-[access "refs/heads/upstream/*"]
-	push = group openstack-ci-core
-	forgeAuthor = group openstack-ci-core
-	forgeCommitter = group openstack-ci-core
-	pushMerge = group openstack-ci-core
-	pushTag = group openstack-ci-core
-	create = group openstack-ci-core
 [access "refs/for/refs/heads/upstream/*"]
-	pushMerge = group openstack-ci-core
+        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
+        forgeAuthor = group openstack-ci-admins
+[access "refs/heads/upstream/*"]
+        push = group openstack-ci-core
+        forgeAuthor = group openstack-ci-core
+        forgeCommitter = group openstack-ci-core
+        pushMerge = group openstack-ci-core
+        pushTag = group openstack-ci-core
+        create = group openstack-ci-core
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/gerritbot.config

@@ -1,12 +1,12 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	create = group openstack-ci-core
+        create = group openstack-ci-core
-	pushTag = group openstack-ci-core
+        pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/gerritlib.config

@@ -1,12 +1,12 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
-[access "refs/tags/*"]
-	create = group openstack-ci-core
-	pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
+[access "refs/tags/*"]
+        create = group openstack-ci-core
+        pushTag = group openstack-ci-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/git-review.config

@@ -1,12 +1,12 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	pushTag = group openstack-ci-admins
+        pushTag = group openstack-ci-admins
-	create = group openstack-ci-admins
+        create = group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/jenkins-job-builder.config

@@ -1,12 +1,12 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	action = cherry pick
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        action = cherry pick
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/lodgeit.config

@@ -1,9 +1,9 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/meetbot.config

@@ -1,14 +1,14 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group openstack-ci-core
+        create = group openstack-ci-core
-	pushTag = group openstack-ci-core
+        pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-	forgeAuthor = group openstack-ci-admins
+        forgeAuthor = group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/nose-html-output.config

@@ -1,14 +1,14 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group openstack-ci-core
+        create = group openstack-ci-core
-	pushTag = group openstack-ci-core
+        pushTag = group openstack-ci-core
 [access "refs/heads/*"]
-	forgeAuthor = group openstack-ci-core
+        forgeAuthor = group openstack-ci-core
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-apparmor.config

@@ -1,18 +1,18 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
-	action = cherry pick
-[project]
-	state = active
 [access "refs/meta/config"]
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Verified = -2..+2 group openstack-ci-admins
+        label-Verified = -2..+2 group openstack-ci-admins
-	submit = group openstack-ci-admins
+        submit = group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true
+        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-dashboard.config

@@ -1,18 +1,18 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
-	action = cherry pick
-[project]
-	state = active
 [access "refs/meta/config"]
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Verified = -2..+2 group openstack-ci-admins
+        label-Verified = -2..+2 group openstack-ci-admins
-	submit = group openstack-ci-admins
+        submit = group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true
+        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-vcsrepo.config

@@ -1,18 +1,18 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
-	action = cherry pick
-[project]
-	state = active
 [access "refs/meta/config"]
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Verified = -2..+2 group openstack-ci-admins
+        label-Verified = -2..+2 group openstack-ci-admins
-	submit = group openstack-ci-admins
+        submit = group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true
+        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-ci/pypi-mirror.config

@@ -1,11 +1,11 @@
-[project]
-	state = active
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-core
+        label-Code-Review = -2..+2 group openstack-ci-core
-	label-Approved = +0..+1 group openstack-ci-core
+        label-Approved = +0..+1 group openstack-ci-core
+[project]
+        state = active
 [receive]
-	requireChangeId = true
+        requireChangeId = true
 [submit]
-	mergeContent = true
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-ci/zuul.config

@@ -1,13 +1,13 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
-	action = cherry pick
 [project]
-	state = active
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true
+        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config

@@ -1,15 +1,15 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group devstack-core
+        label-Code-Review = -2..+2 group devstack-core
-	label-Approved = +0..+1 group devstack-core
+        label-Approved = +0..+1 group devstack-core
 [access "refs/heads/stable/*"]
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
-	label-Code-Review = -2..+2 group devstack-core
+        label-Code-Review = -2..+2 group devstack-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group devstack-core
+        label-Approved = +0..+1 group devstack-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config

@@ -1,14 +1,14 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-        requireShortMessage = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-nose-core
         label-Approved = +0..+1 group openstack-nose-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group openstack-nose-drivers
         label-Approved = +0..+1 group openstack-nose-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-qa-core
+        label-Code-Review = -2..+2 group openstack-qa-core
-	label-Approved = +0..+1 group openstack-qa-core
+        label-Approved = +0..+1 group openstack-qa-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config

@@ -1,14 +1,14 @@
-[project]
-	state = active
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	pushTag = group openstack-ci-admins
+        pushTag = group openstack-ci-admins
-	create = group openstack-ci-admins
+        create = group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config

@@ -1,13 +1,13 @@
 [access "refs/*"]
         owner = group Administrators
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-cla
         label-Approved = +0..+1 group openstack-cla
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group openstack-cla
         label-Approved = +0..+1 group openstack-cla
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/api-site.config

@@ -1,17 +1,17 @@
-[project]
-	state = active
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-doc-core
+        label-Code-Review = -2..+2 group openstack-doc-core
-	label-Approved = +0..+1 group openstack-doc-core
+        label-Approved = +0..+1 group openstack-doc-core
 [access "refs/heads/stable/*"]
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
-	label-Code-Review = -2..+2 group openstack-doc-core
+        label-Code-Review = -2..+2 group openstack-doc-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group openstack-doc-core
+        label-Approved = +0..+1 group openstack-doc-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config

@@ -1,13 +1,13 @@
-[project]
-	state = active
-[receive]
-	requireChangeId = true
-[submit]
-	mergeContent = true
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group ceilometer-drivers
+        create = group ceilometer-drivers
-	pushTag = group ceilometer-drivers
+        pushTag = group ceilometer-drivers
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group ceilometer-drivers
+        label-Approved = +0..+1 group ceilometer-drivers
-	label-Code-Review = -2..+2 group ceilometer-drivers
+        label-Code-Review = -2..+2 group ceilometer-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/cinder.config

@@ -1,8 +1,3 @@
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/*"]
         owner = group Administrators
 [access "refs/heads/*"]
@@ -12,4 +7,9 @@
         label-Code-Review = -2..+2 group cinder-drivers
         label-Approved = +0..+1 group cinder-drivers
 [project]
-	state = active
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/compute-api.config

@@ -1,12 +1,12 @@
-[access "refs/*"]
-	owner = group Administrators
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
-[receive]
+[access "refs/*"]
-	requireChangeId = true
+        owner = group Administrators
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group nova-core
+        label-Code-Review = -2..+2 group nova-core
-	label-Approved = +0..+1 group nova-core
+        label-Approved = +0..+1 group nova-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/glance.config

@@ -1,13 +1,13 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group glance-core
+        label-Code-Review = -2..+2 group glance-core
-	label-Approved = +0..+1 group glance-core
+        label-Approved = +0..+1 group glance-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group glance-drivers
+        label-Code-Review = -2..+2 group glance-drivers
-	label-Approved = +0..+1 group glance-drivers
+        label-Approved = +0..+1 group glance-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/horizon.config

@@ -1,17 +1,17 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group horizon-core
+        label-Code-Review = -2..+2 group horizon-core
-	label-Approved = +0..+1 group horizon-core
+        label-Approved = +0..+1 group horizon-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group horizon-drivers
+        label-Code-Review = -2..+2 group horizon-drivers
-	label-Approved = +0..+1 group horizon-drivers
+        label-Approved = +0..+1 group horizon-drivers
 [access "refs/heads/stable/diablo"]
-	label-Code-Review = -2..+2 group horizon-core
+        label-Code-Review = -2..+2 group horizon-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group horizon-core
+        label-Approved = +0..+1 group horizon-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/identity-api.config

@@ -1,12 +1,12 @@
-[access "refs/*"]
-	owner = group Administrators
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
-[receive]
+[access "refs/*"]
-	requireChangeId = true
+        owner = group Administrators
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group keystone-core
+        label-Code-Review = -2..+2 group keystone-core
-	label-Approved = +0..+1 group keystone-core
+        label-Approved = +0..+1 group keystone-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/image-api.config

@@ -1,12 +1,12 @@
-[access "refs/*"]
-	owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
-[access "refs/heads/*"]
-	label-Code-Review = -2..+2 group glance-core
-	label-Approved = +0..+1 group glance-core
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
+[access "refs/*"]
+        owner = group Administrators
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group glance-core
+        label-Approved = +0..+1 group glance-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/keystone.config

@@ -1,22 +1,22 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[access "refs/heads/*"]
-	label-Code-Review = -2..+2 group keystone-core
-	label-Approved = +0..+1 group keystone-core
-[submit]
-	mergeContent = true
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group keystone-drivers
-	label-Approved = +0..+1 group keystone-drivers
-[access "refs/heads/stable/diablo"]
-	label-Code-Review = -2..+2 group keystone-core
-	label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group keystone-core
-	exclusiveGroupPermissions = label-Approved label-Code-Review
-[project]
-	state = active
 [access "refs/for/refs/*"]
-	pushMerge = group keystone-drivers
+        pushMerge = group keystone-drivers
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group keystone-core
+        label-Approved = +0..+1 group keystone-core
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group keystone-drivers
+        label-Approved = +0..+1 group keystone-drivers
+[access "refs/heads/stable/diablo"]
+        label-Code-Review = -2..+2 group keystone-core
+        label-Code-Review = -1..+1 group Registered Users
+        label-Approved = +0..+1 group keystone-core
+        exclusiveGroupPermissions = label-Approved label-Code-Review
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/melange.config

@@ -1,18 +1,18 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group melange-core
+        label-Code-Review = -2..+2 group melange-core
-	label-Approved = +0..+1 group melange-core
+        label-Approved = +0..+1 group melange-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group melange-drivers
+        label-Code-Review = -2..+2 group melange-drivers
-	label-Approved = +0..+1 group melange-drivers
+        label-Approved = +0..+1 group melange-drivers
 [access "refs/heads/stable/essex"]
-	label-Code-Review = -2..+2 group melange-core
+        label-Code-Review = -2..+2 group melange-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group melange-core
+        label-Approved = +0..+1 group melange-core
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config

@@ -1,12 +1,12 @@
-[access "refs/*"]
-	owner = group Administrators
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
-[receive]
+[access "refs/*"]
-	requireChangeId = true
+        owner = group Administrators
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group quantum-core
+        label-Code-Review = -2..+2 group quantum-core
-	label-Approved = +0..+1 group quantum-core
+        label-Approved = +0..+1 group quantum-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/nova.config

@@ -1,16 +1,16 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group nova-core
+        label-Code-Review = -2..+2 group nova-core
-	label-Approved = +0..+1 group nova-core
+        label-Approved = +0..+1 group nova-core
-	workInProgress = group nova-core
+        workInProgress = group nova-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group nova-drivers
+        label-Code-Review = -2..+2 group nova-drivers
-	label-Approved = +0..+1 group nova-drivers
+        label-Approved = +0..+1 group nova-drivers
 [project]
-	state = active
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/object-api.config

@@ -1,12 +1,12 @@
-[access "refs/*"]
-	owner = group Administrators
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
-[receive]
+[access "refs/*"]
-	requireChangeId = true
+        owner = group Administrators
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group swift-core
+        label-Code-Review = -2..+2 group swift-core
-	label-Approved = +0..+1 group swift-core
+        label-Approved = +0..+1 group swift-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-deploy-core
+        label-Code-Review = -2..+2 group openstack-deploy-core
-	label-Approved = +0..+1 group openstack-deploy-core
+        label-Approved = +0..+1 group openstack-deploy-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/openstack-ci-puppet.config

@@ -1,18 +1,18 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-[submit]
-	mergeContent = true
-	action = cherry pick
-[project]
-	state = active
 [access "refs/meta/config"]
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Verified = -2..+2 group openstack-ci-admins
+        label-Verified = -2..+2 group openstack-ci-admins
-	submit = group openstack-ci-admins
+        submit = group openstack-ci-admins
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true
+        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack/openstack-ci.config

@@ -1,11 +1,11 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-ci-admins
+        label-Code-Review = -2..+2 group openstack-ci-admins
-	label-Approved = +0..+1 group openstack-ci-admins
+        label-Approved = +0..+1 group openstack-ci-admins
 [receive]
-	requireChangeId = true
+        requireChangeId = true
-	requireShortMessage = true
+        requireShortMessage = true
-	requireContributorAgreement = true
+        requireContributorAgreement = true
 [submit]
-	mergeContent = true
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config

@@ -1,15 +1,15 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-doc-core
+        label-Code-Review = -2..+2 group openstack-doc-core
-	label-Approved = +0..+1 group openstack-doc-core
+        label-Approved = +0..+1 group openstack-doc-core
 [access "refs/heads/stable/*"]
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
-	label-Code-Review = -2..+2 group openstack-doc-core
+        label-Code-Review = -2..+2 group openstack-doc-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group openstack-doc-core
+        label-Approved = +0..+1 group openstack-doc-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
         owner = group Administrators
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group openstack-admins
+        label-Approved = +0..+1 group openstack-admins
 [receive]
         requireChangeId = true
         requireContributorAgreement = true
 [submit]
         mergeContent = true
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group openstack-admins
-        label-Approved = +0..+1 group openstack-admins

modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-deploy-core
+        label-Code-Review = -2..+2 group openstack-deploy-core
-	label-Approved = +0..+1 group openstack-deploy-core
+        label-Approved = +0..+1 group openstack-deploy-core
 [receive]
-	requireChangeId = true
+        requireChangeId = true
-	requireContributorAgreement = true
+        requireContributorAgreement = true
 [submit]
-	mergeContent = true
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config

@@ -1,11 +1,5 @@
 [access "refs/*"]
         owner = group Administrators
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-	requireShortMessage = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-common-core
         label-Approved = +0..+1 group openstack-common-core
@@ -13,4 +7,10 @@
         label-Code-Review = -2..+2 group openstack-common-drivers
         label-Approved = +0..+1 group openstack-common-drivers
 [project]
-	state = active
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-cinderclient.config

@@ -1,16 +1,16 @@
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group cinder-core
         label-Approved = +0..+1 group cinder-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group cinder-drivers
         label-Approved = +0..+1 group cinder-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group cinder-drivers
+        create = group cinder-drivers
-	pushTag = group cinder-drivers
+        pushTag = group cinder-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-glanceclient.config

@@ -1,16 +1,16 @@
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group glance-core
         label-Approved = +0..+1 group glance-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group glance-drivers
         label-Approved = +0..+1 group glance-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group glance-drivers
+        create = group glance-drivers
-	pushTag = group glance-drivers
+        pushTag = group glance-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-keystoneclient.config

@@ -1,18 +1,18 @@
-[access "refs/heads/*"]
-	label-Code-Review = -2..+2 group keystone-core
-	label-Approved = +0..+1 group keystone-core
-[access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group keystone-drivers
-	label-Approved = +0..+1 group keystone-drivers
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
-[project]
-	state = active
-[access "refs/tags/*"]
-	create = group keystone-drivers
-	pushTag = group keystone-drivers
 [access "refs/for/refs/*"]
-	pushMerge = group keystone-drivers
+        pushMerge = group keystone-drivers
+[access "refs/heads/*"]
+        label-Code-Review = -2..+2 group keystone-core
+        label-Approved = +0..+1 group keystone-core
+[access "refs/heads/milestone-proposed"]
+        label-Code-Review = -2..+2 group keystone-drivers
+        label-Approved = +0..+1 group keystone-drivers
+[access "refs/tags/*"]
+        create = group keystone-drivers
+        pushTag = group keystone-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-melangeclient.config

@@ -1,16 +1,16 @@
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group melange-core
+        label-Code-Review = -2..+2 group melange-core
-	label-Approved = +0..+1 group melange-core
+        label-Approved = +0..+1 group melange-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group melange-drivers
+        label-Code-Review = -2..+2 group melange-drivers
-	label-Approved = +0..+1 group melange-drivers
+        label-Approved = +0..+1 group melange-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group melange-drivers
+        create = group melange-drivers
-	pushTag = group melange-drivers
+        pushTag = group melange-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-novaclient.config

@@ -1,16 +1,16 @@
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group nova-core
+        label-Code-Review = -2..+2 group nova-core
-	label-Approved = +0..+1 group nova-core
+        label-Approved = +0..+1 group nova-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group nova-drivers
+        label-Code-Review = -2..+2 group nova-drivers
-	label-Approved = +0..+1 group nova-drivers
+        label-Approved = +0..+1 group nova-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group nova-drivers
+        create = group nova-drivers
-	pushTag = group nova-drivers
+        pushTag = group nova-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-openstackclient.config

@@ -1,17 +1,16 @@
-[project]
-	state = active
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group python-openstackclient-core
         label-Approved = +0..+1 group python-openstackclient-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group python-openstackclient-drivers
         label-Approved = +0..+1 group python-openstackclient-drivers
-[access "refs/heads/*"]
 [access "refs/tags/*"]
-	create = group python-openstackclient-drivers
+        create = group python-openstackclient-drivers
-	pushTag = group python-openstackclient-drivers
+        pushTag = group python-openstackclient-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-quantumclient.config

@@ -1,16 +1,16 @@
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group quantum-core
         label-Approved = +0..+1 group quantum-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group quantum-drivers
         label-Approved = +0..+1 group quantum-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group quantum-drivers
+        create = group quantum-drivers
-	pushTag = group quantum-drivers
+        pushTag = group quantum-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/python-swiftclient.config

@@ -1,16 +1,16 @@
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group swift-core
         label-Approved = +0..+1 group swift-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group swift-drivers
         label-Approved = +0..+1 group swift-drivers
-[project]
-	state = active
 [access "refs/tags/*"]
-	create = group swift-drivers
+        create = group swift-drivers
-	pushTag = group swift-drivers
+        pushTag = group swift-drivers
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/quantum.config

@@ -1,25 +1,25 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group Quantum Release Managers
+        create = group Quantum Release Managers
-	pushTag = group Quantum Release Managers
+        pushTag = group Quantum Release Managers
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group quantum-core
+        label-Code-Review = -2..+2 group quantum-core
-	label-Approved = +0..+1 group quantum-core
+        label-Approved = +0..+1 group quantum-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group quantum-drivers
+        label-Code-Review = -2..+2 group quantum-drivers
-	label-Approved = +0..+1 group quantum-drivers
+        label-Approved = +0..+1 group quantum-drivers
 [access "refs/heads/stable/diablo"]
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
-	label-Code-Review = -2..+2 group quantum-core
+        label-Code-Review = -2..+2 group quantum-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group quantum-core
+        label-Approved = +0..+1 group quantum-core
 [access "refs/heads/stable/essex"]
-	exclusiveGroupPermissions = label-Code-Review label-Approved
+        exclusiveGroupPermissions = label-Code-Review label-Approved
-	label-Code-Review = -2..+2 group quantum-core
+        label-Code-Review = -2..+2 group quantum-core
-	label-Code-Review = -1..+1 group Registered Users
+        label-Code-Review = -1..+1 group Registered Users
-	label-Approved = +0..+1 group quantum-core
+        label-Approved = +0..+1 group quantum-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/requirements.config

@@ -1,14 +1,14 @@
 [access "refs/*"]
         owner = group Administrators
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-	requireShortMessage = true
-[submit]
-        mergeContent = true
 [access "refs/heads/*"]
         label-Code-Review = -2..+2 group openstack-common-core
         label-Approved = +0..+1 group openstack-common-core
 [access "refs/heads/milestone-proposed"]
         label-Code-Review = -2..+2 group openstack-common-drivers
         label-Approved = +0..+1 group openstack-common-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+        requireShortMessage = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/swift.config

@@ -1,13 +1,13 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group swift-core
+        label-Code-Review = -2..+2 group swift-core
-	label-Approved = +0..+1 group swift-core
+        label-Approved = +0..+1 group swift-core
 [access "refs/heads/milestone-proposed"]
-	label-Code-Review = -2..+2 group swift-drivers
+        label-Code-Review = -2..+2 group swift-drivers
-	label-Approved = +0..+1 group swift-drivers
+        label-Approved = +0..+1 group swift-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/tempest.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group openstack-qa-core
+        label-Code-Review = -2..+2 group openstack-qa-core
-	label-Approved = +0..+1 group openstack-qa-core
+        label-Approved = +0..+1 group openstack-qa-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack/volume-api.config

@@ -1,14 +1,14 @@
-[project]
-	state = active
-[access "refs/*"]
-	owner = group Administrators
 [access]
-	inheritFrom = API-Projects
+        inheritFrom = API-Projects
-[receive]
+[access "refs/*"]
-	requireChangeId = true
+        owner = group Administrators
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group cinder-core
+        label-Code-Review = -2..+2 group cinder-core
-	label-Approved = +0..+1 group cinder-core
+        label-Approved = +0..+1 group cinder-core
+[project]
+        state = active
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/MRaaS.config

@@ -1,13 +1,13 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
 [access "refs/heads/*"]
-	label-Approved = +0..+1 group mraas-core
+        label-Approved = +0..+1 group mraas-core
-	label-Code-Review = -2..+2 group mraas-core
+        label-Code-Review = -2..+2 group mraas-core
-[receive]
-	requireChangeId = true
-	requireShortMessage = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [project]
-	state = active
+        state = active
+[receive]
+        requireChangeId = true
+        requireShortMessage = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/libra.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group libra-core
+        label-Code-Review = -2..+2 group libra-core
-	label-Approved = +0..+1 group libra-core
+        label-Approved = +0..+1 group libra-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/marconi.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group marconi-core
+        label-Code-Review = -2..+2 group marconi-core
-	label-Approved = +0..+1 group marconi-core
+        label-Approved = +0..+1 group marconi-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/moniker.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group moniker-core
+        label-Code-Review = -2..+2 group moniker-core
-	label-Approved = +0..+1 group moniker-core
+        label-Approved = +0..+1 group moniker-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/python-monikerclient.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group moniker-core
+        label-Code-Review = -2..+2 group moniker-core
-	label-Approved = +0..+1 group moniker-core
+        label-Approved = +0..+1 group moniker-core
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/python-reddwarfclient.config

@@ -1,12 +1,12 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-	create = group reddwarf-drivers
+        create = group reddwarf-drivers
-	pushTag = group reddwarf-drivers
+        pushTag = group reddwarf-drivers
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group reddwarf-drivers
+        label-Code-Review = -2..+2 group reddwarf-drivers
-	label-Approved = +0..+1 group reddwarf-drivers
+        label-Approved = +0..+1 group reddwarf-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/reddwarf.config

@@ -1,10 +1,10 @@
 [access "refs/*"]
-	owner = group Administrators
+        owner = group Administrators
-[receive]
-	requireChangeId = true
-	requireContributorAgreement = true
-[submit]
-	mergeContent = true
 [access "refs/heads/*"]
-	label-Code-Review = -2..+2 group reddwarf-drivers
+        label-Code-Review = -2..+2 group reddwarf-drivers
-	label-Approved = +0..+1 group reddwarf-drivers
+        label-Approved = +0..+1 group reddwarf-drivers
+[receive]
+        requireChangeId = true
+        requireContributorAgreement = true
+[submit]
+        mergeContent = true