Akosiaris has submitted this change and it was merged.
Change subject: reset repo by merging in tag 'v0.7.1' from upstream
......................................................................
reset repo by merging in tag 'v0.7.1' from upstream
release 0.7.1
Conflicts:
debian/changelog
Change-Id: I07cec21c3a5537f26b006653b61e7e5d812aa605
---
M debian/changelog
1 file changed, 0 insertions(+), 20 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 79bce0a..e3efe76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,3 @@
-<<<<<<< HEAD (2dabdf adding gitreview)
-jenkins-debian-glue (0.6.0~20131022.git9d3a3d4) unstable; urgency=low
-
- Incorporate recent upstream changes which are hitting us by merging
- upstream code to 9d3a3d4 (v0.6.0-43-g9d3a3d4). Includes two fixes
- I have made which are causing us issues:
-
- Antoine Musso (2):
- piuparts_wrapper: quote scriptsdir in piuparts cmd
- piuparts_wrapper: unset scripts dir when non existent
-
- -- Antoine "hashar" Musso <has...@free.fr> Tue, 22 Oct 2013 13:51:18 +0000
-
-jenkins-debian-glue (0.6.0~20130919.git7ab545a) unstable; urgency=low
-
- * Building from a specific git tag for internal WMF use
-
- -- Andrew Bogott <abog...@wikimedia.org> Mon, 23 Sep 2013 23:26:58 +0200
-=======
jenkins-debian-glue (0.7.1) unstable; urgency=low
* [80057b0] Drop jenkins-debian-glue-repoenv package + add dependency on
@@ -113,7 +94,6 @@
for build environments without repository)
-- Michael Prokop <m...@debian.org> Wed, 23 Oct 2013 20:32:29 +0200
->>>>>>> BRANCH (fad2b2 Release new version 0.7.1)
jenkins-debian-glue (0.6.0) unstable; urgency=low
--
To view, visit https://gerrit.wikimedia.org/r/95422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07cec21c3a5537f26b006653b61e7e5d812aa605
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/jenkins-debian-glue
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
