Skip to content

Commit

Permalink
Fix lint issues due to merging of PR #649
Browse files Browse the repository at this point in the history
  • Loading branch information
Travis Fields committed Feb 19, 2015
1 parent cb142f4 commit 51d66a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion manifests/backup/mysqlbackup.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/backup.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
$provider = 'mysqldump',
) {

create_resources("class", {
create_resources('class', {
"mysql::backup::${provider}" => {
'backupuser' => $backupuser,
'backuppassword' => $backuppassword,
Expand Down

0 comments on commit 51d66a5

Please sign in to comment.