From 69a75737459eea41f8096c62144a65dedaf1ffdc Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 15 Jun 2018 11:07:56 -0400
Subject: [PATCH] Use yaml merge mapping correctly

At least, correctly as far as Ruby is concerned...
---
 .circleci/config.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0d9091df0..f53fdf565 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -124,13 +124,13 @@ jobs:
 
 
   debian-9:
+    <<: *DEBIAN
     docker:
       - image: "debian:9"
 
-    <<: *DEBIAN
-
 
   deprecations:
+    <<: *DEBIAN
     docker:
       - image: "debian:9"
 
@@ -139,8 +139,6 @@ jobs:
       # Select a tox environment to run for this job.
       TAHOE_LAFS_TOX_ENVIRONMENT: "deprecations,upcoming-deprecations"
 
-    <<: *DEBIAN
-
 
   ubuntu-16.04:
     <<: *DEBIAN
@@ -209,14 +207,14 @@ jobs:
 
       - store_artifacts: *STORE_ARTIFACTS
 
+
   fedora-27:
+    <<: *RHEL_DERIV
     docker:
       - image: "fedora:27"
 
-    <<: *RHEL_DERIV
 
   fedora-28:
+    <<: *RHEL_DERIV
     docker:
       - image: "fedora:28"
-
-    <<: *RHEL_DERIV