Merge lp://qastaging/~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 into lp://qastaging/ubuntu/vivid-updates/neutron-vpnaas
Proposed by
Corey Bryant
| Status: | Approved | ||||
|---|---|---|---|---|---|
| Approved by: | Corey Bryant | ||||
| Approved revision: | 8 | ||||
| Proposed branch: | lp://qastaging/~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 | ||||
| Merge into: | lp://qastaging/ubuntu/vivid-updates/neutron-vpnaas | ||||
| Diff against target: |
572 lines (+290/-43) 20 files modified
AUTHORS (+3/-0) ChangeLog (+11/-0) PKG-INFO (+1/-1) debian/changelog (+11/-0) etc/neutron/rootwrap.d/vpnaas.filters (+1/-0) etc/vpn_agent.ini (+2/-0) neutron_vpnaas.egg-info/PKG-INFO (+1/-1) neutron_vpnaas.egg-info/SOURCES.txt (+2/-0) neutron_vpnaas.egg-info/pbr.json (+1/-1) neutron_vpnaas.egg-info/requires.txt (+11/-11) neutron_vpnaas/services/vpn/agent.py (+1/-0) neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py (+107/-0) neutron_vpnaas/services/vpn/device_drivers/ipsec.py (+8/-7) neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py (+50/-0) neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py (+10/-0) neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py (+49/-0) requirements.txt (+11/-11) setup.cfg (+1/-1) setup.py (+0/-1) test-requirements.txt (+9/-9) |
||||
| To merge this branch: | bzr merge lp://qastaging/~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Corey Bryant (corey.bryant) wrote | # |
Unmerged revisions
- 8. By Corey Bryant
-
* Resynchronize with stable/kilo (9c73c0c) (LP: #1481008):
- [fb18c46] Set vpn agent's agent_state['binary' ] attribute
- [0ec1668] Fix failures for integration tests
- [053fd30] VPNaaS: Fix breakage in status reporting
- [5cc0613] Libreswan driver support in VPNaaS
- [9c73c0c] Provide Fedora support for StrongSwan
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.