jenkins-bot has submitted this change and it was merged.

Change subject: Update release notes and version number
......................................................................


Update release notes and version number

Change-Id: I7bb1d944c963dffdb29b96d0dbe64f9a905394f7
---
M RELEASE-NOTES-1.21
M includes/DefaultSettings.php
2 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  CSteipp: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 12111aa..35c54bf 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -3,6 +3,14 @@
 Security reminder: MediaWiki does not require PHP's register_globals. If you
 have it on, turn it '''off''' if you can.
 
+== MediaWiki 1.21.5 ==
+
+This is a security release of the MediaWiki 1.21 branch.
+
+=== Changes since 1.21.4 ===
+
+* (bug 60339) SECURITY: Sanitize shell arguments to DjVu files, and other 
media formats
+
 == MediaWiki 1.21.4 ==
 
 This is a security release of the MediaWiki 1.21 branch.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a6172f0..61f49de 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -63,7 +63,7 @@
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.21.4';
+$wgVersion = '1.21.5';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php

-- 
To view, visit https://gerrit.wikimedia.org/r/110072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bb1d944c963dffdb29b96d0dbe64f9a905394f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: CSteipp <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to