lp:~mandel/location-service/delayed-providers

Branch merges

Propose for merging

2 branches dependent on this one.

Ready for review for merging into lp:location-service/15.04

Ubuntu Phablet Team: Pending requested 2015-10-22

Diff: 814 lines (+561/-22) (has conflicts)

11 files modified

data/ubuntu-location-service-trust-stored.conf.in (+4/-2)
debian/changelog (+21/-0)
include/location_service/com/ubuntu/location/provider.h (+43/-1)
po/br.po (+28/-0)
po/lb.po (+31/-0)
po/zh_HK.po (+27/-0)
src/location_service/com/ubuntu/location/connectivity/cached_wireless_network.cpp (+40/-11)
src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp (+4/-0)
src/location_service/com/ubuntu/location/provider.cpp (+61/-8)
tests/controller_test.cpp (+213/-0)
tests/mock_delayed_provider.h (+89/-0)

api

Ready for review for merging into lp:location-service/trunk

PS Jenkins bot: Approve (continuous-integration) on 2015-06-16

Jim Hodapp (community): Needs Fixing (code) on 2015-06-15

Alfonso Sanchez-Beato: Approve on 2015-06-15

Diff: 562 lines (+406/-9)

4 files modified

include/location_service/com/ubuntu/location/provider.h (+43/-1)
src/location_service/com/ubuntu/location/provider.cpp (+61/-8)
tests/controller_test.cpp (+213/-0)
tests/mock_delayed_provider.h (+89/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

206. By Manuel de la Peña on 2015-06-16

Made changes according to reviews.

205. By Manuel de la Peña on 2015-06-15

Update docs.

204. By Manuel de la Peña on 2015-06-15

Made chages as per review.

203. By Manuel de la Peña on 2015-06-15

Added support for delayed providers.

202. By Launchpad Translations on behalf of phablet-team on 2015-06-06

Launchpad automatic translations update.

201. By Launchpad Translations on behalf of phablet-team on 2015-06-04

Launchpad automatic translations update.

200. By CI Train Bot Account on 2015-06-01

Releasing 2.1+15.10.20150601.2-0ubuntu1

199. By Manuel de la Peña on 2015-06-01

Ensure that the trust store is started when is needed.

Approved by: Michael Frey, PS Jenkins bot, Thomas Voß

198. By Launchpad Translations on behalf of phablet-team on 2015-06-01

Launchpad automatic translations update.

197. By CI Train Bot Account on 2015-05-28

Releasing 2.1+15.10.20150528.3-0ubuntu1