Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst
Conflicts: manifests/mysql.pp manifests/pgsql.pp templates/pgsql.conf.erb
Showing
Please register or sign in to comment
Conflicts: manifests/mysql.pp manifests/pgsql.pp templates/pgsql.conf.erb