tree 516e6b73391837785cb00b789c91d92e0207c46e
parent d207e253e2d460e736a3bb1b54a9a172d24f6f0d
parent d10dbfa3aebe9dbdb7d2fbf8d78d5bde6a970096
author Filip Pytloun <fpytloun@mirantis.com> 1490092496 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> 1490092497 +0000

Merge changes from topic 'generate-consistent-metrics'

* changes:
  Simplify collectd.lua decoder plugin
  Enhance the collectd decoder for generic metrics