From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 18 Dec 2018 05:45:47 +0000 (+0000)
Subject: Merge "Upgrade wikimedia/ip-set to 1.3.0" into REL1_31
X-Git-Tag: 1.31.2~50
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f6099b206c22ba7b8cf4c640979c17ecfef7677e;hp=ebc5cca3181d19c4ed488ba78cd3a39446dcb055

Merge "Upgrade wikimedia/ip-set to 1.3.0" into REL1_31
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 0368488b71..dc216dcc4d 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -22,6 +22,7 @@ THIS IS NOT A RELEASE YET
   * (T206476) Output only to stderr in unit tests
   * (T207112) Add session_write_close() calls to SessionManager tests
   * oyejorge/less.php replaced with our fork wikimedia/less.php
+  * (T209756) Updated wikimedia/ip-set from 1.2.0 to 1.3.0.
 * (T207540) Include IP address in "Login for $1 succeeded" log entry.
 * (T201781) Database: Allow selectFieldValues() to accept SQL fragments
 * (T205765) installer: Don't link to the obsolete "Extension Matrix" page
diff --git a/composer.json b/composer.json
index b884c543e9..3ed1d97bb6 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
 		"wikimedia/cldr-plural-rule-parser": "1.0.0",
 		"wikimedia/composer-merge-plugin": "1.4.1",
 		"wikimedia/html-formatter": "1.0.2",
-		"wikimedia/ip-set": "1.2.0",
+		"wikimedia/ip-set": "1.3.0",
 		"wikimedia/less.php": "1.8.0",
 		"wikimedia/object-factory": "1.0.0",
 		"wikimedia/php-session-serializer": "1.0.6",