Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227510
Change subject: Merge branch 'debian/precise-wikimedia' into
debian/trusty-wikimedia
......................................................................
Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia
Conflicts:
debian/changelog
debian/control
Change-Id: I9aba501b4243fcd973bf778bc70cb270002c23bf
---
M debian/changelog
M debian/control
2 files changed, 15 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul
refs/changes/10/227510/1
diff --git a/debian/changelog b/debian/changelog
index fe7befc..04aba63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,38 +1,23 @@
-<<<<<<< HEAD (38cdea Merge branch 'debian/precise-wikimedia' into
debian/trusty-w)
-zuul (2.0.0-304-g685ca22-wmf2trusty1) trusty-wikimedia; urgency=low
-=======
-zuul (2.0.0-327-g3ebedde-wmf3precise1) precise-wikimedia; urgency=medium
+zuul (2.0.0-327-g3ebedde-wmf3trusty1) trusty-wikimedia; urgency=medium
+
+ * Sync up with precise-wikimedia 2.0.0-327-g3ebedde-wmf3precise1
+
+ * Bump GitPython from 0.3.2.RC1 to 0.3.2.1. Fetched by dh_virtualenv.
+
+ * Bump upstream 5984adc..3ebedde
+ * python-daemon to >= 2.0.4
+
+ * 0007-Remove-lockfile-from-requirements.patch
+ * python-daemon 2.x shipped via the venv
* 0008-Revert-Fix-passing-labels-to-Gerrit-when-they-are-no
Makes Zuul to send code-review and verified label votes using the shortcuts
--verified and --code-review since --label is case sensitive.
See https://phabricator.wikimedia.org/T106596
- -- Antoine Musso <[email protected]> Thu, 23 Jul 2015 14:11:53 +0000
+ -- Antoine Musso <[email protected]> Tue, 28 Jul 2015 21:32:08 +0200
-zuul (2.0.0-327-g3ebedde-wmf2precise1) precise-wikimedia; urgency=medium
-
- * 0007-Remove-lockfile-from-requirements.patch
- * python-daemon 2.x shipped via the venv
-
- -- Antoine Musso <[email protected]> Tue, 21 Jul 2015 21:27:42 +0200
-
-zuul (2.0.0-327-g3ebedde-wmf1precise1) precise-wikimedia; urgency=low
-
- * Bump upstream 5984adc..3ebedde
- * python-daemon to >= 2.0.4
-
- -- Antoine Musso <[email protected]> Tue, 21 Jul 2015 16:29:03 +0200
-
-
-zuul (2.0.0-306-g5984adc-wmf1precise1) precise-wikimedia; urgency=low
-
- * Bump GitPython from 0.3.2.RC1 to 0.3.2.1. Fetched by dh_virtualenv.
-
- -- Antoine Musso <[email protected]> Mon, 20 Jul 2015 16:10:02 +0200
-
-zuul (2.0.0-304-g685ca22-wmf2precise1) precise-wikimedia; urgency=low
->>>>>>> BRANCH (980c44 Fix gerrit review case mismatch errors with labels)
+zuul (2.0.0-304-g685ca22-wmf2trusty1) trusty-wikimedia; urgency=low
* Sync with precise-wikimedia
* T97106 zuul-cloner should use hard links when fetching from cache-dir
diff --git a/debian/control b/debian/control
index 268393f..39b8dd1 100644
--- a/debian/control
+++ b/debian/control
@@ -23,16 +23,9 @@
python-paste,
python-webob,
python-paramiko,
-<<<<<<< HEAD (38cdea Merge branch 'debian/precise-wikimedia' into
debian/trusty-w)
- python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
- python-gitdb,
- python-smmap,
- python-lockfile (>= 0.8),
-=======
-# python-git (= 0.3.2.RC1-1),
+# python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
# python-gitdb,
# python-smmap,
->>>>>>> BRANCH (980c44 Fix gerrit review case mismatch errors with labels)
#Build in python 2.7:
#python-orderdict
#python-daemon,
@@ -84,18 +77,10 @@
python-paste,
python-webob,
python-paramiko,
-<<<<<<< HEAD (38cdea Merge branch 'debian/precise-wikimedia' into
debian/trusty-w)
- python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
- python-gitdb,
- python-smmap,
- python-lockfile (>= 0.8),
- python-daemon,
-=======
-# python-git (= 0.3.2.RC1-1),
+# python-git (>= 0.3.2~RC1), python-git (<<0.3.3),
# python-gitdb,
# python-smmap,
# python-daemon,
->>>>>>> BRANCH (980c44 Fix gerrit review case mismatch errors with labels)
python-extras,
python-voluptuous (>= 0.7),
python-gear (>= 0.5.4),
--
To view, visit https://gerrit.wikimedia.org/r/227510
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aba501b4243fcd973bf778bc70cb270002c23bf
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/trusty-wikimedia
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
