Unyonsys/puppet-module-keepalived — pull request #2 by danehans (2013-01-04 19:42:57+00:00)
Title: Changes to track haproxy service

Changes seem to merge cleanly. As you can tell, the changes are not very big.

$ git merge master
Auto-merging templates/keepalived_instance.erb
Merge made by the 'recursive' strategy.
README | 15 ++++++++++++---
templates/global_config.erb | 5 +++++
templates/keepalived_instance.erb | 6 +++---
3 files changed, 20 insertions(+), 6 deletions(-)