lp:~allenap/maas/neighbours-service-live

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:~maas-committers/maas/trunk

MAAS Maintainers: Pending requested 2016-06-22

Diff: 1225 lines (+914/-116)

10 files modified

src/maasserver/models/tests/test_sshkey.py (+1/-1)
src/provisioningserver/plugin.py (+7/-0)
src/provisioningserver/pserv_services/neighbours.py (+63/-0)
src/provisioningserver/pserv_services/testing/neighbours.py (+38/-0)
src/provisioningserver/pserv_services/tests/test_neighbours.py (+122/-0)
src/provisioningserver/tests/test_plugin.py (+1/-1)
src/provisioningserver/utils/neighbours.py (+224/-0)
src/provisioningserver/utils/network.py (+24/-40)
src/provisioningserver/utils/tests/test_neighbours.py (+384/-0)
src/provisioningserver/utils/tests/test_network.py (+50/-74)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3874. By Gavin Panella on 2016-06-23

Merged trunk into neighbours-service-live.

3873. By Gavin Panella on 2016-06-22

Merged select-c-utf-bytes-locale into neighbours-service-live.

3872. By Gavin Panella on 2016-06-22

Move p.neighbours to p.utils.neighbours.

3871. By Gavin Panella on 2016-06-22

Use select_c_utf8_bytes_locale, and fix a few more tests.

3870. By Gavin Panella on 2016-06-22

New function, select_c_utf8_bytes_locale.

3869. By Gavin Panella on 2016-06-22

Update for Python 3 and fix remaining tests.

3868. By Gavin Panella on 2016-06-22

Merge trunk.

3867. By Gavin Panella on 2015-10-14

Always return the most recently seen address.

3866. By Gavin Panella on 2015-10-14

Fix docstrings.

3865. By Gavin Panella on 2015-10-14

Merge trunk.