tree 1fec72b579a356a2a040572e117a2c9bd99d31f5
parent 85b25c5ad45add95aabdb4b0db218c3638c87f01
parent 9837178bdc035cf8f57349251a82622edb1d17ba
author Petr Michalec <pmichalec@mirantis.com> 1506936823 +0000
committer Gerrit Code Review <gerrit2@6a1f56eca807> 1506936823 +0000

Merge "Add salt-minion and salt-master to telegraf"