Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-03-03 20:07:50 -06:00
commit 0b390e397e
1 changed files with 1 additions and 0 deletions

View File

@ -38,6 +38,7 @@
'driver' => 'beanstalkd', 'driver' => 'beanstalkd',
'host' => 'localhost', 'host' => 'localhost',
'queue' => 'default', 'queue' => 'default',
'ttr' => 60,
), ),
'sqs' => array( 'sqs' => array(