Merge branch 'master' into develop

2014-02-28 16:06:05 -06:00
parent c457a93ddb fafb9837dd
commit 0c9aded889
3 changed files with 45 additions and 38 deletions
--- a/app/config/queue.php
+++ b/app/config/queue.php
@@ -50,8 +50,9 @@ return array(

 		'iron' => array(
 			'driver'  => 'iron',
-			'project' => 'your-project-id',
+			'host'    => 'mq-aws-us-east-1.iron.io',
 			'token'   => 'your-token',
+			'project' => 'your-project-id',
 			'queue'   => 'your-queue-name',
 			'encrypt' => true,
 		),