aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--config/memcached.yml-test2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 4b771efc2..497a03159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ before_install:
- git submodule update --init --recursive
- psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres
- cp config/database.yml-test config/database.yml
- - cp config/memcached.yml-example config/memcached.yml
+ - cp config/memcached.yml-test config/memcached.yml
- sudo apt-get update
- export DEBIAN_FRONTEND=noninteractive
- sudo apt-get -y install exim4-daemon-light
diff --git a/config/memcached.yml-test b/config/memcached.yml-test
new file mode 100644
index 000000000..18d959876
--- /dev/null
+++ b/config/memcached.yml-test
@@ -0,0 +1,2 @@
+test:
+ disabled: true \ No newline at end of file