Merge pull request #674 from cyberious/LintFixes

Fix lint issues due to merging of PR #649
xbezdick · Feb 19, 2015 · efcf2ed · efcf2ed
2 parents cb142f4 + 51d66a5
commit efcf2ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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,