Chris Price 4360004ea2 Merge remote-tracking branch 'ghoneycutt/ticket/1.0.x/xxxx_style_updates' into maint/master/resolve-merge-conflict ... Conflicts: manifests/server/database_ini.pp		2012-09-20 16:22:46 -07:00
..
database_ini.pp	Merge remote-tracking branch 'ghoneycutt/ticket/1.0.x/xxxx_style_updates' into maint/master/resolve-merge-conflict	2012-09-20 16:22:46 -07:00
firewall.pp	complies with style guide	2012-09-20 14:46:26 -07:00
jetty_ini.pp	complies with style guide	2012-09-20 14:46:26 -07:00
validate_db.pp	complies with style guide	2012-09-20 14:46:26 -07:00