puppet lint error
Merge branch 'master' of https://github.com/icalvete/puppet-roles

Conflicts:
	manifests/td_agent_server.pp