From: Adam Dickmeiss Date: Fri, 5 Sep 2014 11:52:51 +0000 (+0200) Subject: Merge branch 'master' into paz-927 X-Git-Tag: v1.12.0~22 X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=e9e5603afa14e52f004d64211345f1c3ab17a6a3;p=pazpar2-moved-to-github.git Merge branch 'master' into paz-927 --- e9e5603afa14e52f004d64211345f1c3ab17a6a3 diff --cc src/pazpar2_config.h index a5f4a81,1343790..ab10abd --- a/src/pazpar2_config.h +++ b/src/pazpar2_config.h @@@ -153,9 -154,10 +153,9 @@@ struct conf_serve struct conf_config *config; http_server_t http_server; iochan_man_t iochan_man; - database_hosts_t database_hosts; }; - struct conf_config *config_create(const char *fname, int verbose); + struct conf_config *config_create(const char *fname); void config_destroy(struct conf_config *config); void config_process_events(struct conf_config *config); void info_services(struct conf_server *server, WRBUF w);