Legoktm has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/347187 )
Change subject: Merge tag 'debian/1%1.27.2-1' into xenial ...................................................................... Merge tag 'debian/1%1.27.2-1' into xenial Change-Id: I54432afc4f0e1af77640c8852cb5590b756e331d --- M debian/changelog 1 file changed, 10 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index ef23e87..ea45d8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,9 @@ -<<<<<<< HEAD (57dc75 Merge tag 'debian/1%1.27.1-3' into xenial) -mediawiki (1:1.27.1-3ppa1~xenial1) xenial; urgency=medium +mediawiki (1:1.27.2-1ppa1~xenial1) xenial; urgency=medium * Rebuild for xenial - * Drop default-mysql-server recommendation - -- Kunal Mehta <[email protected]> Fri, 17 Feb 2017 04:25:10 -0800 -======= + -- Kunal Mehta <[email protected]> Sat, 08 Apr 2017 13:29:11 -0700 + mediawiki (1:1.27.2-1) unstable; urgency=medium * Improve NEWS file (Closes: #852862, #854352) @@ -15,7 +13,13 @@ CVE-2017-0369, CVE-2017-0367, CVE-2017-0372 -- Kunal Mehta <[email protected]> Thu, 06 Apr 2017 14:04:24 -0700 ->>>>>>> BRANCH (d9222c Update changelog for 1.27.2 release) + +mediawiki (1:1.27.1-3ppa1~xenial1) xenial; urgency=medium + + * Rebuild for xenial + * Drop default-mysql-server recommendation + + -- Kunal Mehta <[email protected]> Fri, 17 Feb 2017 04:25:10 -0800 mediawiki (1:1.27.1-3) unstable; urgency=medium -- To view, visit https://gerrit.wikimedia.org/r/347187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54432afc4f0e1af77640c8852cb5590b756e331d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/debian Gerrit-Branch: xenial Gerrit-Owner: Legoktm <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
