summaryrefslogtreecommitdiff
path: root/tests/etc
diff options
context:
space:
mode:
authorMatt Goins <mjgoins@openflows.com>2009-01-31 23:59:15 -0500
committerMatt Goins <mjgoins@openflows.com>2009-01-31 23:59:15 -0500
commita8aa9a5f0d1d1e3832fee0b36f3462992bb5d142 (patch)
tree2019f0654e3df9f4f82c0a7b6656f5716bea8085 /tests/etc
parentb5cdb9cff70a5ab6982e79c7acd0c9bc0a010c49 (diff)
parentbbbc5bb8accf1db41d6a95e227f028376823cddf (diff)
Merge commit 'jrollins/master'
Diffstat (limited to 'tests/etc')
-rw-r--r--tests/etc/monkeysphere/monkeysphere-authentication.conf (renamed from tests/etc/monkeysphere/monkeysphere-server.conf)0
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/etc/monkeysphere/monkeysphere-server.conf b/tests/etc/monkeysphere/monkeysphere-authentication.conf
index 9cc396f..9cc396f 100644
--- a/tests/etc/monkeysphere/monkeysphere-server.conf
+++ b/tests/etc/monkeysphere/monkeysphere-authentication.conf