jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404263 )
Change subject: Merge tag '2.5.1' into debian/jessie-wikimedia ...................................................................... Merge tag '2.5.1' into debian/jessie-wikimedia Tag 2.5.1 Bump debian/changelog to 2.5.1-wmf1 Cleanup gbp configuration Generated the changelog with: gbp dch --since wikimedia/debian/jessie-wikimedia --debian-branch=debian/jessie-wikimedia Bug: T158243 Change-Id: I03b36968e8b6657e1e64c89f65d0519873da9749 --- M debian/changelog M debian/gbp.conf 2 files changed, 31 insertions(+), 6 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 55686fd..6d60beb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +zuul (2.5.1-wmf1) jessie-wikimedia; urgency=medium + + [ Antoine Musso ] + * Update to 2.5.1 + * Point gbp upstream-tag to %(version)s + * Drop debian-branch=HEAD, just hardcode our branch + + Upstream changelogs: + + [ James E. Blair ] + * Revert "Make job registration with labels optional" + * Ansible launcher: re-register functions after disconnect + + [ Paul Belanger ] + * Use {{ ansible_host }} for ssh-keyscan + + [ Arie ] + * Handle non-valid HEAD + + [ Sean Dague ] + * bump timeout on ssh commands to 30s + + [ James E. Blair ] + * Ansible launcher: add AFS publisher + * Ansible launcher: run k5start in playbook + * Ansible launcher: format ipv6 urls [correctly] + + -- Antoine Musso <has...@free.fr> Mon, 15 Jan 2018 10:25:44 +0100 + zuul (2.5.0-8-gcbc7f62-wmf7) jessie-wikimedia; urgency=medium * Patch: "Fix change number extraction on new enough Gerrit master" diff --git a/debian/gbp.conf b/debian/gbp.conf index edecf99..e4d2871 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,9 +2,5 @@ pristine-tar = False compression = gzip -ignore-branch = True - -# source and /debian/ are in the same tree and we have a branch per repository. -# To avoid having to pass -git-debian-branch when checking out branches, just -# point to HEAD which has the appropriate /debian/ -debian-branch = HEAD +debian-branch = debian/jessie-wikimedia +upstream-tag = %(version)s -- To view, visit https://gerrit.wikimedia.org/r/404263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03b36968e8b6657e1e64c89f65d0519873da9749 Gerrit-PatchSet: 4 Gerrit-Project: integration/zuul Gerrit-Branch: debian/jessie-wikimedia Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits