shixiong/okd @ 4a97c9d0f7409b2be90964647f5712e51df37242

Devan Goodwin f24cc239bc Merge remote-tracking branch 'upstream/master' into upgrade33		9 роки тому
..
tasks	14b23a8b14 Get rpm installations functional again.	9 роки тому
vars	0c7433838c Work towards determining openshift_version when unspecified.	9 роки тому