From 25c575fe165838bf2142168afcbd241e4a1942d6 Mon Sep 17 00:00:00 2001
From: Mateusz Uzdowski <mateusz@silverstripe.com>
Date: Mon, 30 Mar 2015 14:16:17 +1300
Subject: [PATCH] Fix version dependencies, and fix what travis builds.

---
 .travis.yml                         | 6 +++---
 composer.json                       | 6 +++---
 tests/VersionFeedFunctionalTest.php | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25a6b7c..f0a7e2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ matrix:
     - php: 5.3
       env: DB=PGSQL CORE_RELEASE=3.1
     - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
     - php: 5.5
-      env: DB=MYSQL CORE_RELEASE=master
+      env: DB=MYSQL CORE_RELEASE=3.1
 
 before_script:
  - phpenv rehash
@@ -25,4 +25,4 @@ before_script:
  - cd ~/builds/ss
 
 script: 
- - phpunit versionfeed/tests/
\ No newline at end of file
+ - phpunit versionfeed/tests/
diff --git a/composer.json b/composer.json
index 6fcc39b..98f81b7 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
 	],
 	"require":
 	{
-		"silverstripe/framework": "3.*",
-		"silverstripe/cms": "3.*"
+		"silverstripe/framework": ">=3.1",
+		"silverstripe/cms": ">=3.1"
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/VersionFeedFunctionalTest.php b/tests/VersionFeedFunctionalTest.php
index d441821..e1c31e3 100644
--- a/tests/VersionFeedFunctionalTest.php
+++ b/tests/VersionFeedFunctionalTest.php
@@ -213,3 +213,4 @@ class VersionFeedFunctionalTest extends FunctionalTest {
 	}
 
 }
+