opendev/system-config
Code Issues Proposed changes

Stop cherry-picking in infra

Browse Source 
We encountered some problems, notably, the updated commit message
breaks "git brannch -d" workflow, and Sean Dague ran into problems
with the implementation in Gerrit.

Change-Id: I9f2d411bb9c926b3da919bb9ab986dd589f9f42c
Reviewed-on: https://review.openstack.org/37348
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-07-16 16:12:55 -07:00 committed by Jenkins
parent a4042eb7c6
commit 87bd7eb026
16 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/config.config
View File

@ -7,4 +7,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config
View File

@ -9,5 +9,4 @@
[receive]
requireChangeId = true
[submit]
action = cherry pick
mergeContent = true

1
modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config
View File

@ -11,4 +11,3 @@
requireContributorAgreement = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config
View File

@ -12,4 +12,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config
View File

@ -12,4 +12,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config
View File

@ -15,4 +15,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config
View File

@ -10,4 +10,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config
View File

@ -12,4 +12,3 @@
requireChangeId = true
[submit]
mergeContent = true
action = cherry pick

1
modules/openstack_project/files/gerrit/acls/test-manage-project.config
View File

@ -9,7 +9,6 @@
requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
[project]
state = active
[access "refs/meta/config"]

1
modules/openstack_project/files/zuul/layout-dev.yaml
View File

@ -122,7 +122,6 @@ projects:
- gate-noop
- name: openstack-infra/config
merge-mode: cherry-pick
check:
- config-compare-xml
- gate-config-layout

1
modules/openstack_project/files/zuul/layout.yaml
View File

@ -282,7 +282,6 @@ projects:
- gate-noop
- name: openstack-infra/config
merge-mode: cherry-pick
check:
- config-compare-xml
- gate-config-layout