jenkins-bot has submitted this change and it was merged. Change subject: Merge branch 'elastic' ......................................................................
Merge branch 'elastic' Change-Id: I7ce8d01d4bfb8441c5a0d4f11cdc24105e4bb229 --- M CirrusSearch.i18n.php 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Demon: Looks good to me, approved jenkins-bot: Verified diff --git a/CirrusSearch.i18n.php b/CirrusSearch.i18n.php index f67d301..8a91e4c 100644 --- a/CirrusSearch.i18n.php +++ b/CirrusSearch.i18n.php @@ -10,11 +10,7 @@ * English */ $messages['en'] = array( -<<<<<<< HEAD (b3657c Localisation updates from http://translatewiki.net.) - 'cirrussearch-desc' => 'Makes the search Solr-powered', -======= 'cirrussearch-desc' => 'Elasticsearch-powered search for MediaWiki', ->>>>>>> BRANCH (11704e Wrap search requests in PoolCounter.) 'cirrussearch-backend-error' => 'We could not complete your search due to a temporary problem. Please try again later.', ); -- To view, visit https://gerrit.wikimedia.org/r/74192 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ce8d01d4bfb8441c5a0d4f11cdc24105e4bb229 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CirrusSearch Gerrit-Branch: master Gerrit-Owner: Demon <[email protected]> Gerrit-Reviewer: Demon <[email protected]> Gerrit-Reviewer: Manybubbles <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
