Merge lp://staging/~corey.bryant/neutron/2014.1.4 into lp://staging/~ubuntu-server-dev/neutron/icehouse

Proposed by Corey Bryant
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~corey.bryant/neutron/2014.1.4
Merge into: lp://staging/~ubuntu-server-dev/neutron/icehouse
Diff against target: 149 lines (+124/-0)
4 files modified
debian/changelog (+8/-0)
debian/patches/ignore-http-proxy-during-test.patch (+62/-0)
debian/patches/pep-0476.patch (+52/-0)
debian/patches/series (+2/-0)
To merge this branch: bzr merge lp://staging/~corey.bryant/neutron/2014.1.4
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+253692@code.staging.launchpad.net
To post a comment you must log in.
269. By Corey Bryant

* Support new version of Python 2.7 (LP: #1434575):
  - d/p/pep-0476.patch: PEP 476 updates.
  - d/p/ignore-http-proxy-during-test.patch: PEP 476 updates.

Revision history for this message
Martin Pitt (pitti) wrote :

wily has a much newer version, so this looks obsolete.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches