Allow to control diamond version through pillar
Merge pull request #5 from legion-github/master

Allow to control diamond version through pillar
Change backlog and inteval
Merge pull request #6 from legionus/change-backlog-interval

Change backlog and inteval
Set metric prefix from pillar
Merge pull request #7 from legionus/set-metric-prefix

Set metric prefix from pillar
Set hostname_method from pillar
Merge pull request #8 from legionus/set-hostname-method

Set hostname_method from pillar
added docker collector
removed ppa from pillar.example
Merge pull request #9 from nikicat/master

added docker collector
Allow define hosts for pickle and plaintext
Change pillar namespace for hosts
Set port from pillar
Update pillar.example
Merge pull request #10 from legionus/split-hosts

Allow define hosts for pickle and plaintext
Fix typo
Merge pull request #11 from legionus/master

Fix typo
Merge remote-tracking branch 'upstream/master'