opendev/system-config
Code Issues Proposed changes

Switch hacking and pbr to merge-if-necessary.

Browse Source 
They (probably accidentally) were set up with the cherry-pick merge
strategy, but we should confine that to openstack-infra for the time
being until we are sure we want to support it more widely.

Change-Id: Ic813fd8d5b320ada1d83b468d41a43d430d49a04
Reviewed-on: https://review.openstack.org/30955
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: David Ripton <dripton@redhat.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-05-29 14:53:45 -07:00 committed by Jenkins
parent f51ac05e3e
commit 0f219a1d0b
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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