| commit | 51dc3eb9f3ed6fb1216f7b219ef1f7aeb6b61fb9 | [log] [tgz] |
|---|---|---|
| author | Filip Pytloun <fpytloun@mirantis.com> | Wed Jul 12 10:47:51 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@32a4cf582fa9> | Wed Jul 12 10:47:52 2017 +0000 |
| tree | 481adb257fe0443af877fd1d583be38eda27a3dd | |
| parent | a85375d32f6635ca2c86d8145343d069652517e0 [diff] | |
| parent | d9b442b1faeae9cdeef5249b4839444ae6454436 [diff] |
Merge "Deep-merge service meta with pillar data"