summaryrefslogtreecommitdiff
path: root/test/config
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
committerelijah <elijah@riseup.net>2015-03-31 10:52:07 -0700
commite4679c66565d0ccae54ffc58a23083841e5585e7 (patch)
tree2cc7fbb5d3e6a48d21a605a8411da38ea8c999e3 /test/config
parent2365129a1dcbb1231f0ac22d4bf975007a0c460d (diff)
fix travis: use couchdb.admin.yml and pin travis ruby version to one that is installed on travis-ci.org
Diffstat (limited to 'test/config')
-rw-r--r--test/config/couchdb.admin.yml (renamed from test/config/couchdb.yml.admin)0
-rw-r--r--test/config/couchdb.yml (renamed from test/config/couchdb.yml.user)0
2 files changed, 0 insertions, 0 deletions
diff --git a/test/config/couchdb.yml.admin b/test/config/couchdb.admin.yml
index 0988bc1..0988bc1 100644
--- a/test/config/couchdb.yml.admin
+++ b/test/config/couchdb.admin.yml
diff --git a/test/config/couchdb.yml.user b/test/config/couchdb.yml
index 9c8b67b..9c8b67b 100644
--- a/test/config/couchdb.yml.user
+++ b/test/config/couchdb.yml