Merge pull request #563 from jwon/master

Increase retries for creating incidents

src/iris/api.py

@@ -1681,8 +1681,9 @@ def on_post(self, req, resp):
                 raise HTTPBadRequest('No plan template actions exist for this app')
 
         # To try to avoid deadlocks, split the inserts into their own session
+        # FIXME: Actually resolve deadlock issue by splitting the reads and the writes.
         retries = 0
-        max_retries = 5
+        max_retries = 10
         while True:
             with db.guarded_session() as session:
                 retries += 1