Fix infinite retry logic
Merge pull request #544 from liggitt/fix_infinite_retry

Merged by openshift-bot