Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74192
Change subject: Merge branch 'elastic'
......................................................................
Merge branch 'elastic'
Conflicts:
CirrusSearch.i18n.php
Change-Id: I7ce8d01d4bfb8441c5a0d4f11cdc24105e4bb229
---
M CirrusSearch.i18n.php
M Elastica
2 files changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/92/74192/1
diff --git a/CirrusSearch.i18n.php b/CirrusSearch.i18n.php
index 19e125b..c1ebc27 100644
--- a/CirrusSearch.i18n.php
+++ b/CirrusSearch.i18n.php
@@ -10,11 +10,7 @@
* English
*/
$messages['en'] = array(
-<<<<<<< HEAD (c040a7 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.',
);
diff --git a/Elastica b/Elastica
index 04d6762..f0d77c4 160000
--- a/Elastica
+++ b/Elastica
-Subproject commit 04d676299efc91372f23919bf878652380fb0d77
+Subproject commit f0d77c44748717a27a87fa47f7003831220cab88
--
To view, visit https://gerrit.wikimedia.org/r/74192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ce8d01d4bfb8441c5a0d4f11cdc24105e4bb229
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
