Fixes for pending_op changes
Merge pull request #3676 from abhgupta/abhgupta-scheduler

Merged by openshift-bot