Merge branch 'master' into develop

2014-03-03 20:07:50 -06:00
parent 0c9aded889 9bf9c2eb42
commit 0b390e397e
1 changed files with 1 additions and 0 deletions
@@ -38,6 +38,7 @@ return array(
 			'driver' => 'beanstalkd',
 			'host'   => 'localhost',
 			'queue'  => 'default',
+			'ttr'    => 60,
 		),

 		'sqs' => array(