From 0f219a1d0b69da3adf5798b6a02fb7d858f341e8 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 29 May 2013 14:53:45 -0700 Subject: [PATCH] Switch hacking and pbr to merge-if-necessary. 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 Reviewed-by: David Ripton Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../files/gerrit/acls/openstack-dev/hacking.config | 1 - .../openstack_project/files/gerrit/acls/openstack-dev/pbr.config | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config index a7e0c9dcf3..8b6aa12d83 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/hacking.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config index ee64b1f20d..f1b809abc5 100644 --- a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config +++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config @@ -10,4 +10,3 @@ requireChangeId = true [submit] mergeContent = true - action = cherry pick