ClusterHQ/flocker — pull request #965 by dwgebler (2014-11-11 15:26:06+00:00)
Title: Flocker config resource limits floc 963

Fixes FLOC-963

(merge #963 before reviewing this, as those changes are currently merged in to this branch for testing)