default resource settings
Merge pull request #1351 from bdecoste/master

Merged by openshift-bot