Merge branch 'master' into feature/add-json-output

Conflicts: INSTALL
2013-08-17 14:49:17 -05:00
parent c6f21fdeca f86b764cab
commit dc75ca2edd
25 changed files with 178 additions and 17 deletions
--- a/src/output_modules/output_modules.c
+++ b/src/output_modules/output_modules.c
@ -18,7 +18,6 @@ extern output_module_t module_extended_file;

 #ifdef REDIS
 extern output_module_t module_redis;
-extern output_module_t module_ssldbfeed;
 #endif

 #ifdef JSON
@ -30,7 +29,6 @@ output_module_t* output_modules[] = {
 	&module_extended_file,
 #ifdef REDIS
 	&module_redis,
-	&module_ssldbfeed,
 #endif
 #ifdef JSON
 	&module_json_file,