fix merge conflict error causing the $cluster parameter to go missing
authorMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:01:44 +0000 (15:01 -0400)
committerMicah Anderson <micah@riseup.net>
Wed, 3 Apr 2013 19:01:44 +0000 (15:01 -0400)
commitd7acd567ace308049848733d8f1c801b955974a8
tree2d96270a1c428b69f7839ab124064e3c9ebff3c0
parentc3d3f81b98542b94a013440c81b0942c9c4a82cf
fix merge conflict error causing the $cluster parameter to go missing
manifests/centos.pp
manifests/init.pp