tree 70db4a87528631ec418ff95db61f635f2d2291e2
parent ffc2225dde7b95f9e63b73c0cb6102d0c75effc0
parent ec185e3ee81cc7b497836c6a280f85dc8b743900
author Filip Pytloun <filip@pytloun.cz> 1501161869 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> 1501161870 +0000

Merge "Fix meta/salt when heka_alarming is not present"