summaryrefslogtreecommitdiff
path: root/soledad_server
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-26 10:34:41 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-26 10:34:41 -0300
commitcff05bca05c0f87b1994315c04897c22d18c4e77 (patch)
treebf4ba7cfc8b51701b8097c30a6a4b2887eb41d88 /soledad_server
parentcaeb0e0fb32617fd8ca2a24239b5a68a034bc4f1 (diff)
Fold in changes
Diffstat (limited to 'soledad_server')
-rw-r--r--soledad_server/changes/2621-refactor-audh-to-make-it-adaptable2
-rw-r--r--soledad_server/changes/fix_privkey2
2 files changed, 0 insertions, 4 deletions
diff --git a/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable b/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable
deleted file mode 100644
index 775f7e8d..00000000
--- a/soledad_server/changes/2621-refactor-audh-to-make-it-adaptable
+++ /dev/null
@@ -1,2 +0,0 @@
- o Refactor server side auth classes to make it possible for other kinds of
- authentication to be easily implemented. Closes #2621.
diff --git a/soledad_server/changes/fix_privkey b/soledad_server/changes/fix_privkey
deleted file mode 100644
index 87bf4d54..00000000
--- a/soledad_server/changes/fix_privkey
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix double specified /etc/leap/soledad-server.pem in initscript by pointing
-the PRIVKEY_PATH to /etc/leap/soledad-server.key. Fixes #3174.