shixiong/okd @ 39bc207ab2f60570c6de35fbd86ae7d47ade4bd7

Devan Goodwin 03f31fdc58 Merge remote-tracking branch 'upstream/master' into upgrade33		8 роки тому
..
defaults	c45562e0e0 Set openshift_version in config playbooks for first master.	9 роки тому
meta	79d58eeb6e Fix 'recursive loop detected in template string' for upgrading variable.	9 роки тому
tasks	03f31fdc58 Merge remote-tracking branch 'upstream/master' into upgrade33	8 роки тому
templates	42dec74c57 More version fixes.	8 роки тому