Fix bug 988782: add --rerun to oo-admin-upgrade help
Merge pull request #3263 from danmcp/master

Bug 990948
Merge pull request #3260 from pmorie/bugs/988782

Merged by openshift-bot