Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315429
Change subject: Merge branch 'debian/precise-wikimedia' into
debian/jessie-wikimedia
......................................................................
Merge branch 'debian/precise-wikimedia' into debian/jessie-wikimedia
Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
---
M debian/changelog
1 file changed, 0 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul
refs/changes/29/315429/1
diff --git a/debian/changelog b/debian/changelog
index 84c6eaf..4b2c739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,6 @@
-<<<<<<< HEAD (1b5a8f New release 2.5.0-8-gcbc7f62-wmf3jessie1)
zuul (2.5.0-8-gcbc7f62-wmf3jessie1) jessie-wikimedia; urgency=medium
* sync with precise-wikimedia:
-=======
-zuul (2.5.0-8-gcbc7f62-wmf4precise1) precise-wikimedia; urgency=medium
-
- * Link zuul-launcher in /usr/bin
- * Properly set zuul-clear-refs and shebang. Fix T103529
- * source ignore .pyc files and .tox directory
-
- -- Antoine Musso <has...@free.fr> Tue, 11 Oct 2016 17:53:38 +0200
-
-zuul (2.5.0-8-gcbc7f62-wmf3precise1) precise-wikimedia; urgency=medium
->>>>>>> BRANCH (3d87ab 2.5.0-8-gcbc7f62-wmf4precise1)
* Fix shebang of several scripts to point to the virtualenv.
Refresh 0002-Replace-python-shebang-with-python2.7.patch
--
To view, visit https://gerrit.wikimedia.org/r/315429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1816a01cd8cea5a1b9ea92f70cb9ec5fd2051910
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/jessie-wikimedia
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
