From 9572c2cec542d2b2e3e1f8b4dfc8e3f34071a598 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Fri, 26 Dec 2014 12:40:49 +0100
Subject: [PATCH] change default serializer to json

---
 gvaldap/gvaldap/settings/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py
index 136f641..66e1433 100644
--- a/gvaldap/gvaldap/settings/base.py
+++ b/gvaldap/gvaldap/settings/base.py
@@ -290,6 +290,6 @@ BROKER_URL = get_env_setting('GVALDAP_BROKER_URL')
 CELERY_RESULT_BACKEND = 'amqp'
 CELERY_RESULT_PERSISTENT = True
 CELERY_TASK_RESULT_EXPIRES = None
-CELERY_ACCEPT_CONTENT = ['yaml']
-CELERY_RESULT_SERIALIZER = 'yaml'
+CELERY_ACCEPT_CONTENT = ['yaml', 'json']
+CELERY_RESULT_SERIALIZER = 'json'
 ########## END CELERY CONFIGURATION