shixiong/okd @ a2426112f4f8cfbca18a6596d25089e8311cd152

Scott Dodson 7a523d6d5a Merge pull request #8487 from mwoodson/master		6 роки тому
..
defaults	7a523d6d5a Merge pull request #8487 from mwoodson/master	6 роки тому
files	5d5d25bf17 Upgrade to 3.10 with static pods	7 роки тому
meta	29692bcb64 Consolidate image diciontaries and strings	7 роки тому
tasks	77029a66b2 fixed volume-config bug; this wasn't being applied appropriately	6 роки тому
templates	7a523d6d5a Merge pull request #8487 from mwoodson/master	6 роки тому