tree 481adb257fe0443af877fd1d583be38eda27a3dd
parent a85375d32f6635ca2c86d8145343d069652517e0
parent d9b442b1faeae9cdeef5249b4839444ae6454436
author Filip Pytloun <fpytloun@mirantis.com> 1499856471 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1499856472 +0000

Merge "Deep-merge service meta with pillar data"