Merge branch 'master' into 2857-collection-tests

[arvados.git] / docker / api / supervisor.conf

diff --git a/docker/api/supervisor.conf b/docker/api/supervisor.conf
index bd38c83edf4b1752db57164ec50a5d30126d7aec..a9eed1ed6d6ff01df52bb332ad8e81e52dd1d8ce 100644 (file)
--- a/docker/api/supervisor.conf
+++ b/docker/api/supervisor.conf
@@ -1,6 +1,3 @@
-[supervisord]
-nodaemon=true
-
 [program:postgres]
 user=postgres
 command=/usr/lib/postgresql/9.1/bin/postgres -D /var/lib/postgresql/9.1/main -c config_file=/etc/postgresql/9.1/main/postgresql.conf