Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst

Conflicts:
	manifests/mysql.pp
	manifests/pgsql.pp
	templates/pgsql.conf.erb

diff --cc manifests/mysql.pp
index ee2e71d73baac806f07790843083a494d295202e,f968cf98e995ba579664a12b1031f40e30c56809..8e33e8edf0fb766995127fd646b65f7a61bc94f6
--- 1/manifests/mysql.pp
--- 2/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@@ -18,7 -18,7 +18,8 @@@ define backupninja::mysql
    $order = 10, $ensure = present, $user = false, $dbusername = false, $dbpassword = false,
    $dbhost = 'localhost', $databases = 'all', $backupdir = false, $hotcopy = false,
    $sqldump = false, $compress = false, $configfile = true,
-   $vsname = false, $sqldumpoptions = '--lock-tables --complete-insert --add-drop-table --quick --quote-names')
 -  $vsname = false, $nodata = false)
++  $vsname = false, $sqldumpoptions = '--lock-tables --complete-insert --add-drop-table --quick --quote-names',
++  $nodata = false)
  {
    
    $real_configfile = $configfile ? {

diff --cc templates/mysql.conf.erb
Simple merge