From 2385b738550c8d9678c87cc09f2d40a4d8c078c4 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 21 Jul 2017 15:02:27 +1200
Subject: [PATCH 1/2] BUG fix config rules to match updated `Except`

---
 tests/php/Core/Manifest/ConfigManifestTest.php              | 6 +++---
 .../configmanifest/mysite/_config/multiplerules.yml         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/php/Core/Manifest/ConfigManifestTest.php b/tests/php/Core/Manifest/ConfigManifestTest.php
index 5d619d183..32b8483d0 100644
--- a/tests/php/Core/Manifest/ConfigManifestTest.php
+++ b/tests/php/Core/Manifest/ConfigManifestTest.php
@@ -210,9 +210,9 @@ class ConfigManifestTest extends SapphireTest
             'Fragment is included if both Only rules succeed.'
         );
 
-        $this->assertTrue(
-            isset($config['TwoExceptSucceed']),
-            'Fragment is included if one of the Except rules matches.'
+        $this->assertFalse(
+            isset($config['OneExceptFail']),
+            'Fragment is not included if one of the Except rules fails.'
         );
 
         $this->assertFalse(
diff --git a/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
index ae9a25bf1..1addb62d0 100644
--- a/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
+++ b/tests/php/Core/Manifest/fixtures/configmanifest/mysite/_config/multiplerules.yml
@@ -21,7 +21,7 @@ Except:
 ---
 SilverStripe\Core\Tests\Manifest\ConfigManifestTest:
   MultipleRules:
-    TwoExceptSucceed: "included - one of the excepts succeeds"
+    OneExceptFail: "excluded - one of the excepts fails"
 ---
 Except:
   ConstantDefined: MULTIPLERULES_DEFINEDCONSTANT

From d5ab45990d6b1baa06dc0307f52fa86272b76f9e Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 21 Jul 2017 22:21:14 +1200
Subject: [PATCH 2/2] Lock travis to precise

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 56e9edc17..cf9b0d3ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: php
 
 sudo: false
 
+dist: precise
+
 addons:
   apt:
     packages: