openshift/origin-server — pull request #4488 by lsm5 (2014-01-15 20:42:48+00:00)
Title: New node conf

use both old and new config variables