tree bb9d1cefb75131f62564f36018c4d0dae0af46b3
parent 67ba3d055305813dcb2ca6cdb76defc566dc0ad1
parent 77da6479300a5b0a98cf49779f7735b44e8e0ff2
author Jakub Josef <jjosef@mirantis.com> 1498820529 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1498820530 +0000

Merge "Fix pillar data for compute in k8s contrail"