Merge pull request #674 from cyberious/LintFixes

hunner · hunner · commit efcf2ed9d7e7 · 2015-02-19T11:00:02.000-08:00
Fix lint issues due to merging of PR #649
diff --git a/manifests/backup/mysqlbackup.pp b/manifests/backup/mysqlbackup.pp
@@ -84,7 +84,7 @@
       'password'               => $backuppassword,
     }
   }
-  $options = mysql_deepmerge($default_options, $override_options)
+  $options = mysql_deepmerge($default_options, $mysql::server::override_options)
 
   file { 'mysqlbackup-config-file':
     path    => '/etc/mysql/conf.d/meb.cnf',
diff --git a/manifests/server/backup.pp b/manifests/server/backup.pp
@@ -19,7 +19,7 @@
   $provider           = 'mysqldump',
 ) {
 
-  create_resources("class", {
+  create_resources('class', {
     "mysql::backup::${provider}" => {
       'backupuser'         => $backupuser,
       'backuppassword'     => $backuppassword,

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`'password' => $backuppassword,`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`- $options = mysql_deepmerge($default_options, $override_options)`
	`87`	`+ $options = mysql_deepmerge($default_options, $mysql::server::override_options)`
`88`	`88`
`89`	`89`	`file { 'mysqlbackup-config-file':`
`90`	`90`	`path => '/etc/mysql/conf.d/meb.cnf',`