summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-06-04 11:15:28 -0300
committerdrebs <drebs@leap.se>2015-06-04 11:15:28 -0300
commitb73d45aad428a530917a0f7b2e6e75645376eacc (patch)
tree15f0fb29c236fee5ca5ee65fd546d0c08606913d /server
parent289fab7dbeace040cdd6752026870e4d72e8265f (diff)
parent9fb1c47ca7da06d6feef6846b812aec28128ed78 (diff)
Merge tag '0.7.0' into develop
Tag version 0.7.0. Conflicts: client/pkg/requirements.pip common/pkg/requirements.pip
Diffstat (limited to 'server')
-rw-r--r--server/changes/bug_6436_run-daemon-as-user-soledad1
-rw-r--r--server/changes/bug_6437_avoid-sslv31
-rw-r--r--server/changes/bug_6557_fix-server-initscript-location1
-rw-r--r--server/changes/bug_6797_add-dependency-on-twisted1
-rw-r--r--server/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
-rw-r--r--server/changes/bug_fix-initscript-uid-and-gid1
-rw-r--r--server/changes/feature_6785_use-monthly-token-db1
7 files changed, 0 insertions, 8 deletions
diff --git a/server/changes/bug_6436_run-daemon-as-user-soledad b/server/changes/bug_6436_run-daemon-as-user-soledad
deleted file mode 100644
index 886964f1..00000000
--- a/server/changes/bug_6436_run-daemon-as-user-soledad
+++ /dev/null
@@ -1 +0,0 @@
- o Run daemon as user soledad (#6436).
diff --git a/server/changes/bug_6437_avoid-sslv3 b/server/changes/bug_6437_avoid-sslv3
deleted file mode 100644
index 5d41fbb3..00000000
--- a/server/changes/bug_6437_avoid-sslv3
+++ /dev/null
@@ -1 +0,0 @@
- o Avoid use of SSLv3 (#6437).
diff --git a/server/changes/bug_6557_fix-server-initscript-location b/server/changes/bug_6557_fix-server-initscript-location
deleted file mode 100644
index 6032b302..00000000
--- a/server/changes/bug_6557_fix-server-initscript-location
+++ /dev/null
@@ -1 +0,0 @@
- o Fix server initscript location (#6557).
diff --git a/server/changes/bug_6797_add-dependency-on-twisted b/server/changes/bug_6797_add-dependency-on-twisted
deleted file mode 100644
index 962222b0..00000000
--- a/server/changes/bug_6797_add-dependency-on-twisted
+++ /dev/null
@@ -1 +0,0 @@
- o Add dependency on Twisted. Closes #6797.
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717..00000000
--- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
- o Remove unneeded parameters from CouchServerState initialization. Closes
- #6833.
diff --git a/server/changes/bug_fix-initscript-uid-and-gid b/server/changes/bug_fix-initscript-uid-and-gid
deleted file mode 100644
index d4767984..00000000
--- a/server/changes/bug_fix-initscript-uid-and-gid
+++ /dev/null
@@ -1 +0,0 @@
- o Fix server daemon uid and gid by passing them to twistd on the initscript.
diff --git a/server/changes/feature_6785_use-monthly-token-db b/server/changes/feature_6785_use-monthly-token-db
deleted file mode 100644
index f7987cad..00000000
--- a/server/changes/feature_6785_use-monthly-token-db
+++ /dev/null
@@ -1 +0,0 @@
- o Use monthly token databases. Closes #6785.