James E. Blair 704a02d3d5 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
2012-12-17 18:39:39 +00:00
..