Hashar has submitted this change and it was merged. Change subject: Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia ......................................................................
Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia Refresh patch for zuul-cloner --cache-no-hardlinks 0005-Cloner-Implement-cache-no-hardlinks-argument.patch to latest upstream version https://review.openstack.org/#/c/117626/11 Bump wmf version. Bug: T97106 Change-Id: Ic4e84af30dc2bedce39bbd82cbedd598695c876e --- M debian/changelog 1 file changed, 6 insertions(+), 12 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 7d6157f..13b0f01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,10 @@ -<<<<<<< HEAD (a615d8 Merge branch 'debian/precise-wikimedia' into debian/trusty-w) +zuul (2.1.0-60-g1cc37f7-wmf2trusty1) trusty-wikimedia; urgency=medium + + * Sync with precise-wikimedia (refresh zuul-cloner no-hardlinks patch) + + -- Antoine Musso <[email protected]> Fri, 13 Nov 2015 14:36:02 +0100 + zuul (2.1.0-60-g1cc37f7-wmf1trusty1) trusty-wikimedia; urgency=medium -======= -zuul (2.1.0-60-g1cc37f7-wmf2precise1) precise-wikimedia; urgency=medium - - * Refresh patch 0005-Cloner-Implement-cache-no-hardlinks-argument.patch to - latest upstream version https://review.openstack.org/#/c/117626/11 - Closes https://phabricator.wikimedia.org/T97106 - - -- Antoine Musso <[email protected]> Fri, 13 Nov 2015 14:15:50 +0100 - -zuul (2.1.0-60-g1cc37f7-wmf1precise1) precise-wikimedia; urgency=medium ->>>>>>> BRANCH (d95958 Refresh patch for zuul-cloner --cache-no-hardlinks) * Sync with precise-wikimedia * Bump upstream from 3ebedde to 1cc37f7 -- To view, visit https://gerrit.wikimedia.org/r/252933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic4e84af30dc2bedce39bbd82cbedd598695c876e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/trusty-wikimedia Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
