shixiong/okd @ aa33d58fdfbaf48863cd1e151b9e3743f49d4e98

OpenShift Merge Robot 8e2eda9909 Merge pull request #7486 from smarterclayton/remove_non_static		7 роки тому
..
upgrades	8e2eda9909 Merge pull request #7486 from smarterclayton/remove_non_static	7 роки тому
roles	6a4b7a5eb6 Configuration updates for latest builds and major refactor	10 роки тому