jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380803 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
de5162a Don't call getErrorCode on ValidationError
e14cf03 Delete ganglia_reporter, use new module
209b617 Latest updates to civicrm
3a89222 Prometheus: add extension, update default dir
Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
---
D sites/all/modules/ganglia_reporter/ganglia_reporter.info
M sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
2 files changed, 0 insertions(+), 11 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/ganglia_reporter/ganglia_reporter.info
b/sites/all/modules/ganglia_reporter/ganglia_reporter.info
deleted file mode 100644
index 41d1124..0000000
--- a/sites/all/modules/ganglia_reporter/ganglia_reporter.info
+++ /dev/null
@@ -1,8 +0,0 @@
-<<<<<<< HEAD (89b800 Merge branch 'master' into deployment)
-name = Ganglia Reporter
-description = Reports metrics to Ganglia
-core = 7.x
-configure = admin/config/ganglia_reporter/configure
-files[] = GangliaReporter.php
-=======
->>>>>>> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")
diff --git
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
index 98a83f0..7df123f 100644
---
a/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
+++
b/sites/all/modules/metrics_reporting/tests/phpunit/PrometheusReporterTest.php
@@ -1,5 +1,3 @@
-<<<<<<< HEAD (89b800 Merge branch 'master' into deployment)
-=======
<?php
/**
@@ -31,4 +29,3 @@
rmdir( $dir );
}
}
->>>>>>> BRANCH (2f0028 Merge "Prometheus: add extension, update default dir")
--
To view, visit https://gerrit.wikimedia.org/r/380803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I336e38e857b9c9d771405caedb4529a4175e1170
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Mepps <me...@wikimedia.org>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: Mepps <me...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
