jenkins-bot has submitted this change and it was merged.
Change subject: Remove -hhvm suffix from beta multiversion config
......................................................................
Remove -hhvm suffix from beta multiversion config
Change-Id: Ic5d9b615cfe38b203915a47d53c4bf78ed9e2d7b
---
M multiversion/MWMultiVersion.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Reedy: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/multiversion/MWMultiVersion.php b/multiversion/MWMultiVersion.php
index f3aec00..dc3e84b 100644
--- a/multiversion/MWMultiVersion.php
+++ b/multiversion/MWMultiVersion.php
@@ -151,7 +151,7 @@
} elseif ( isset( $staticMappings[$serverName] ) ) {
$lang = $staticMappings[$serverName];
} elseif ( strpos( $serverName, 'wmflabs' ) !== false ) {
- if ( preg_match(
'/^([^.]+)\.([^.]+)\.beta(?:-hhvm)?\.wmflabs\.org$/', $serverName, $matches ) )
{
+ if ( preg_match(
'/^([^.]+)\.([^.]+)\.beta\.wmflabs\.org$/', $serverName, $matches ) ) {
// http://en.wikipedia.beta.wmflabs.org/
$lang = $matches[1];
if ( $matches[2] === 'wikimedia' ) {
@@ -161,7 +161,7 @@
} else {
$site = $matches[2];
}
- } elseif ( preg_match(
'/^([a-z0-9]*)\.beta(?:-hhvm)?\.wmflabs\.org$/', $serverName, $matches ) ) {
+ } elseif ( preg_match(
'/^([a-z0-9]*)\.beta\.wmflabs\.org$/', $serverName, $matches ) ) {
// http://wikidata.beta.wmflabs.org/
$lang = $matches[1];
}
--
To view, visit https://gerrit.wikimedia.org/r/173486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5d9b615cfe38b203915a47d53c4bf78ed9e2d7b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
