Merge lp://staging/~corey.bryant/ubuntu/trusty/neutron/revert-sql-alchemy-patch into lp://staging/ubuntu/trusty/neutron
Proposed by
Corey Bryant
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~corey.bryant/ubuntu/trusty/neutron/revert-sql-alchemy-patch |
| Merge into: | lp://staging/ubuntu/trusty/neutron |
| Diff against target: |
4002 lines (+3501/-0) (has conflicts) 99 files modified
debian/NEWS (+8/-0) debian/changelog (+752/-0) debian/compat (+1/-0) debian/control (+667/-0) debian/copyright (+37/-0) debian/cron.d/neutron-dhcp-agent-netns-cleanup (+4/-0) debian/cron.d/neutron-l3-agent-netns-cleanup (+4/-0) debian/cron.d/neutron-lbaas-agent-netns-cleanup (+4/-0) debian/mans/neutron-linuxbridge-agent.8 (+11/-0) debian/mans/neutron-nec-agent.8 (+11/-0) debian/mans/neutron-openvswitch-agent.8 (+11/-0) debian/mans/neutron-rootwrap.8 (+11/-0) debian/mans/neutron-ryu-agent.8 (+11/-0) debian/mans/neutron-server.8 (+11/-0) debian/neutron-common.dirs (+5/-0) debian/neutron-common.install (+14/-0) debian/neutron-common.postinst (+31/-0) debian/neutron-dhcp-agent.install (+4/-0) debian/neutron-dhcp-agent.logrotate (+7/-0) debian/neutron-dhcp-agent.upstart (+22/-0) debian/neutron-l3-agent.install (+4/-0) debian/neutron-l3-agent.logrotate (+7/-0) debian/neutron-l3-agent.upstart (+22/-0) debian/neutron-lbaas-agent.install (+4/-0) debian/neutron-lbaas-agent.logrotate (+7/-0) debian/neutron-lbaas-agent.upstart (+17/-0) debian/neutron-metadata-agent.install (+3/-0) debian/neutron-metadata-agent.logrotate (+7/-0) debian/neutron-metadata-agent.upstart (+19/-0) debian/neutron-plugin-bigswitch.install (+1/-0) debian/neutron-plugin-brocade.install (+1/-0) debian/neutron-plugin-cisco.install (+1/-0) debian/neutron-plugin-hyperv.install (+2/-0) debian/neutron-plugin-linuxbridge-agent.install (+2/-0) debian/neutron-plugin-linuxbridge-agent.logrotate (+7/-0) debian/neutron-plugin-linuxbridge-agent.manpages (+1/-0) debian/neutron-plugin-linuxbridge-agent.upstart (+17/-0) debian/neutron-plugin-linuxbridge.install (+1/-0) debian/neutron-plugin-metaplugin.install (+1/-0) debian/neutron-plugin-metering-agent.install (+2/-0) debian/neutron-plugin-metering-agent.upstart (+19/-0) debian/neutron-plugin-midonet.install (+1/-0) debian/neutron-plugin-ml2.install (+1/-0) debian/neutron-plugin-mlnx-agent.install (+2/-0) debian/neutron-plugin-mlnx-agent.upstart (+19/-0) debian/neutron-plugin-nec-agent.install (+2/-0) debian/neutron-plugin-nec-agent.logrotate (+7/-0) debian/neutron-plugin-nec-agent.manpages (+1/-0) debian/neutron-plugin-nec-agent.upstart (+17/-0) debian/neutron-plugin-nec.install (+1/-0) debian/neutron-plugin-nicira.install (+3/-0) debian/neutron-plugin-openvswitch-agent.install (+2/-0) debian/neutron-plugin-openvswitch-agent.logrotate (+7/-0) debian/neutron-plugin-openvswitch-agent.manpages (+1/-0) debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart (+13/-0) debian/neutron-plugin-openvswitch-agent.upstart (+17/-0) debian/neutron-plugin-openvswitch.install (+1/-0) debian/neutron-plugin-plumgrid.install (+1/-0) debian/neutron-plugin-ryu-agent.install (+2/-0) debian/neutron-plugin-ryu-agent.logrotate (+7/-0) debian/neutron-plugin-ryu-agent.manpages (+1/-0) debian/neutron-plugin-ryu-agent.upstart (+17/-0) debian/neutron-plugin-ryu.install (+1/-0) debian/neutron-plugin-vpn-agent.install (+2/-0) debian/neutron-plugin-vpn-agent.upstart (+19/-0) debian/neutron-server.default (+5/-0) debian/neutron-server.install (+1/-0) debian/neutron-server.logrotate (+7/-0) debian/neutron-server.manpages (+2/-0) debian/neutron-server.upstart (+23/-0) debian/neutron_sudoers (+3/-0) debian/patches/disable-failing-cisco-test.patch (+25/-0) debian/patches/disable-failing-metaplugin-tests.patch (+67/-0) debian/patches/disable-udev-tests.patch (+1008/-0) debian/patches/fix-quantum-configuration.patch (+48/-0) debian/patches/series (+7/-0) debian/patches/skip-ipv6-tests.patch (+22/-0) debian/patches/skip-lb-test.patch (+14/-0) debian/patches/sql-alchemy-0.8.3-compat.patch (+67/-0) debian/pydist-overrides (+3/-0) debian/python-neutron.install (+1/-0) debian/rules (+31/-0) debian/source/format (+1/-0) debian/tests/bigswitch-plugin (+19/-0) debian/tests/brocade-plugin (+19/-0) debian/tests/cisco-plugin (+19/-0) debian/tests/control (+6/-0) debian/tests/hyperv-plugin (+19/-0) debian/tests/linuxbridge-plugin (+19/-0) debian/tests/midonet-plugin (+19/-0) debian/tests/nec-plugin (+19/-0) debian/tests/neutron-daemons (+14/-0) debian/tests/nicira-plugin (+19/-0) debian/tests/openvswitch-plugin (+19/-0) debian/tests/plumgrid-plugin (+19/-0) debian/tests/python-neutron (+14/-0) debian/tests/ryu-plugin (+19/-0) debian/tests/test_import_neutron.py (+4/-0) debian/watch (+3/-0) Conflict adding file debian. Moved existing file to debian.moved. |
| To merge this branch: | bzr merge lp://staging/~corey.bryant/ubuntu/trusty/neutron/revert-sql-alchemy-patch |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chuck Short | Pending | ||
|
Review via email:
|
|||
Description of the change
debian/
To post a comment you must log in.
Unmerged revisions
- 236. By Corey Bryant
-
debian/
patches/ sql-alchemy- 0.8.3-compat. patch: Revert prior drop. - 235. By Chuck Short
-
debian/
patches/ bump-sqlalchemy -version. patch: Dropped no longer needed. - 234. By Chuck Short
-
debian/
patches/ sql-alchemy- 0.8.3-compat. patch: Dropped no longer needed. - 233. By Chuck Short
-
Disable patch
- 232. By Chuck Short
-
debian/
patches/ requirements. patch: Dropped no longer needed. - 231. By Chuck Short
-
debian/rules: Re-enabled tests.
- 230. By Chuck Short
-
releasing package neutron version 1:2014.
1~b2-0ubuntu6 - 229. By Chuck Short
-
releasing package neutron version 1:2014.
1~b2-0ubuntu6 - 228. By Chuck Short
-
Fix up changelog
- 227. By Chuck Short
-
debian/rules: Really run_tests.sh.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
