Merge branch 'master' into FeedPoller

This commit is contained in:
Mikael Nordfeldth 2013-12-02 13:53:56 +01:00
commit 0af75a5a2a

View File

@ -85,7 +85,7 @@ $default =
'priority' => 'debug', # XXX: currently ignored 'priority' => 'debug', # XXX: currently ignored
'facility' => LOG_USER), 'facility' => LOG_USER),
'queue' => 'queue' =>
array('enabled' => false, array('enabled' => true,
'subsystem' => 'db', # default to database, or 'stomp' 'subsystem' => 'db', # default to database, or 'stomp'
'stomp_server' => null, 'stomp_server' => null,
'queue_basename' => '/queue/statusnet/', 'queue_basename' => '/queue/statusnet/',