From 704a02d3d50c0be5a59aa201a49a209b2d156db8 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Mon, 17 Dec 2012 08:59:47 -0800
Subject: [PATCH] Have zuul cherry-pick config changes.

The project already cherry-picks, this changes zuul's merge
strategy to match.

Change-Id: I6090c3ea30496128e7ca4f958597a27712752e0d
Reviewed-on: https://review.openstack.org/18242
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 modules/openstack_project/files/zuul/layout.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b83f2f0d35..e08322c3da 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -202,6 +202,7 @@ projects:
       - gate-meetbot-merge
 
   - name: openstack-infra/config
+    merge-mode: cherry-pick
     check:
       - gate-config-merge:
         - gate-config-syntax