Making the domain_op complete? method more robust
Merge pull request #5351 from abhgupta/abhgupta-scheduler

Merged by openshift-bot