From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 6 Mar 2015 22:47:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'mayfirst/master' into merge_mayfirst
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b2c9640c654b0d9ba2f5949ef53480c855a6d1f0;p=puppet-backupninja.git

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

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

b2c9640c654b0d9ba2f5949ef53480c855a6d1f0
diff --cc manifests/mysql.pp
index ee2e71d,f968cf9..8e33e8e
--- a/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 ? {