Gage has submitted this change and it was merged.
Change subject: merge regression fix & re-enable GELF logging
......................................................................
merge regression fix & re-enable GELF logging
Change-Id: Ibf898fdf113e7a1cd0df4cb7879a273e9f3e01dc
---
M manifests/role/analytics/hadoop.pp
M modules/cdh
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ottomata: Looks good to me, approved
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index 9f3ef48..3cb56cf 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -56,7 +56,7 @@
$mapreduce_job_reuse_jvm_num_tasks = 1
$fair_scheduler_template = 'hadoop/fair-scheduler.xml.erb'
# setting this to false or undef interferes with defining it within a node
- $gelf_logging_enabled = false
+ $gelf_logging_enabled = true
# Configs specific to Production.
diff --git a/modules/cdh b/modules/cdh
index 80dd7cb..c77bf57 160000
--- a/modules/cdh
+++ b/modules/cdh
-Subproject commit 80dd7cbdf860a6f6a9d1574406b65e04735c07b1
+Subproject commit c77bf571600fbd1638e16ac9dc92f6d826e0d995
--
To view, visit https://gerrit.wikimedia.org/r/160061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf898fdf113e7a1cd0df4cb7879a273e9f3e01dc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage <[email protected]>
Gerrit-Reviewer: Gage <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
