fix conflict of prs #5 #9

SumoLogic / sumologic-collector-puppet-module

Puppet module for installing Sumo Logic's collector.

Other

11 stars 22 forks source link

fix conflict of prs #5 #9 #10

Closed TerribleDev closed 8 years ago

TerribleDev commented 8 years ago

PR's #5 and #9 had conflicting results, when #9 was merged in, it removed the use of the template in #5

I'm no puppet-master so this was as elegant of a fix as I could come up with, but if someone has any suggestions where things could be more elegant...I am all ears.

TerribleDev commented 8 years ago

bump...

duchatran commented 8 years ago

@tparnell8 : Just merged #11. You might need to resolve some conflicts with this pull.

TerribleDev commented 8 years ago

@duchatran I just pushed...

duchatran commented 8 years ago

Thanks!