Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377685 )
Change subject: grafana: quote reserved word 'type'
......................................................................
grafana: quote reserved word 'type'
The future parser has an Erron krypton, saying:
Error: Use of reserved word: type, must be quoted
if intended to be a String value
Change-Id: I3d75d89beef96d06f6c174a3b2fdadf95f1c0eac
---
M modules/role/manifests/grafana/base.pp
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/377685/1
diff --git a/modules/role/manifests/grafana/base.pp
b/modules/role/manifests/grafana/base.pp
index ba5c255..9c3bcb5 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -41,7 +41,11 @@
# sqlite3 is the default, and it's perfectly adequate.
'database' => {
'type' => 'sqlite3',
+<<<<<<< HEAD
'path' => 'grafana.db',
+=======
+ path => 'grafana.db',
+>>>>>>> 1e6c5fe7f2... grafana: quote reserved word 'type'
},
'security' => {
--
To view, visit https://gerrit.wikimedia.org/r/377685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d75d89beef96d06f6c174a3b2fdadf95f1c0eac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
