shixiong/okd @ e7c2f8db54e2042332eb371b5138edfbe60a8e82

Sen descrición

Andrew Block e7c2f8db54 Merge pull request #212 from etsauer/openshift-enterprise-3		%!s(int64=9) %!d(string=hai) anos
roles	03dc869a95 Merge pull request #157 from vvaldez/satellite-with-org	%!s(int64=9) %!d(string=hai) anos