Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/250442
Change subject: Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia ...................................................................... Merge branch 'debian/precise-wikimedia' into debian/trusty-wikimedia Change-Id: Ic59fb96be7edfe1a26789578d8369fbd0d27fa8e --- M debian/changelog M debian/control 2 files changed, 9 insertions(+), 66 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul refs/changes/42/250442/1 diff --git a/debian/changelog b/debian/changelog index 0374d00..f6402d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,54 +1,12 @@ -<<<<<<< HEAD (38cdea Merge branch 'debian/precise-wikimedia' into debian/trusty-w) -zuul (2.0.0-304-g685ca22-wmf2trusty1) trusty-wikimedia; urgency=low -======= -zuul (2.1.0-60-g1cc37f7-wmf1precise1) precise-wikimedia; urgency=medium +zuul (2.1.0-60-g1cc37f7-wmf1precise1) trusty-wikimedia; urgency=medium + * Sync with precise-wikimedia * Bump upstream from 3ebedde to 1cc37f7 + * Embed python-daemon and python-gear - * Rebased patches and dropped patches merged upstream - 0002-Merger-ensure_cloned-now-looks-for-.git.patch - 0007-Remove-lockfile-from-requirements.patch + -- Antoine Musso <[email protected]> Mon, 02 Nov 2015 16:50:58 +0100 - * Dependencies changes: - Babel 1.3 -> 2.1.1 - lockfile 0.10.2 -> 0.11.0 - python-daemon 2.0.5 -> 2.0.6 - + gear 0.5.8 - - -- Antoine Musso <[email protected]> Mon, 02 Nov 2015 12:01:46 +0100 - -zuul (2.0.0-327-g3ebedde-wmf3precise1) precise-wikimedia; urgency=medium - - * 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 - -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 (5ceb59 Bump Debian version and rebase patches) +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 031e93e..cb6f0d4 100644 --- a/debian/control +++ b/debian/control @@ -23,23 +23,16 @@ 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 (5ceb59 Bump Debian version and rebase patches) #Build in python 2.7: #python-orderdict #python-daemon, python-extras, #python-statsd (>= 1.0.0, <3.0) python-voluptuous (>= 0.7), - python-gear (>= 0.5.4), +# python-gear (>= 0.5.4), python-apscheduler (>= 2.1.1), python-prettytable (>= 0.6), python-tz, @@ -84,21 +77,13 @@ 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 (5ceb59 Bump Debian version and rebase patches) python-extras, python-voluptuous (>= 0.7), - python-gear (>= 0.5.4), +# python-gear (>= 0.5.4), python-apscheduler (>= 2.1.1), python-prettytable (>= 0.6), python-six (>= 1.6.0), -- To view, visit https://gerrit.wikimedia.org/r/250442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic59fb96be7edfe1a26789578d8369fbd0d27fa8e 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
