shixiong/okd @ a2426112f4f8cfbca18a6596d25089e8311cd152

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