Merge "rdbms: do not bother making DBO_TRX transactions in IDatabase::lock()"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 32c1959..24239fd 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -65,6 +65,7 @@ production.
 * Updated wikimedia/running-stat from 1.1.0 to 1.2.0.
 * Updated wikimedia/wrappedstring from 2.2.0 to 2.3.0.
 * Updated mediawiki/at-ease from 1.1.0 to 1.2.0.
+* Updated wikimedia/php-session-serializer from 1.0.4 to 1.0.5.
 * …
 
 ==== New external libraries ====

diff --git a/composer.json b/composer.json
index c3ff8d6..56d1633 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
                "wikimedia/html-formatter": "1.0.1",
                "wikimedia/ip-set": "1.2.0",
                "wikimedia/object-factory": "1.0.0",
-               "wikimedia/php-session-serializer": "1.0.4",
+               "wikimedia/php-session-serializer": "1.0.5",
                "wikimedia/purtle": "1.0.6",
                "wikimedia/relpath": "2.1.1",
                "wikimedia/remex-html": "1.0.2",