Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/252934
Change subject: Merge branch 'debian/precise-wikimedia' into debian/jessie-wikimedia ...................................................................... Merge branch 'debian/precise-wikimedia' into debian/jessie-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, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/34/252934/1 diff --git a/debian/changelog b/debian/changelog index 863f4a2..f62fcde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -<<<<<<< HEAD (8b4cd0 Port trusty version to jessie-wikimedia) -zuul (2.1.0-60-g1cc37f7-wmf1jessie1) jessie-wikimedia; urgency=medium -======= +zuul (2.1.0-60-g1cc37f7-wmf2jessie1) jessie-wikimedia; urgency=medium + + * Sync with precise-wikimedia (refresh zuul-cloner no-hardlinks patch) + + -- Antoine Musso <[email protected]> Fri, 13 Nov 2015 14:45:19 +0100 + zuul (2.1.0-60-g1cc37f7-wmf2precise1) precise-wikimedia; urgency=medium * Refresh patch 0005-Cloner-Implement-cache-no-hardlinks-argument.patch to @@ -9,8 +12,7 @@ -- 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) +zuul (2.1.0-60-g1cc37f7-wmf1jessie1) jessie-wikimedia; urgency=medium * Port to jessie-wikimedia from trusty flavor * Add virtualenv to Build-Depends. -- To view, visit https://gerrit.wikimedia.org/r/252934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic4e84af30dc2bedce39bbd82cbedd598695c876e Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul Gerrit-Branch: debian/jessie-wikimedia Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
