lp:~pedronis/ubuntu-push/automatic-land-to-vivid
- Get this branch:
- bzr branch lp:~pedronis/ubuntu-push/automatic-land-to-vivid
Branch merges
- Roberto Alsina (community): Approve
-
Diff: 3221 lines (+1310/-514)15 files modifiedbus/networkmanager/networkmanager.go (+65/-12)
bus/networkmanager/networkmanager_test.go (+109/-1)
bus/urfkill/urfkill.go (+94/-0)
bus/urfkill/urfkill.go_test.go (+121/-0)
client/client.go (+23/-61)
client/client_test.go (+57/-140)
client/session/session.go (+208/-82)
client/session/session_test.go (+358/-173)
debian/changelog (+23/-0)
debian/config.json (+2/-1)
launch_helper/kindpool_test.go (+1/-1)
poller/poller.go (+164/-32)
poller/poller_test.go (+71/-11)
scripts/click-hook (+2/-0)
server/tlsconfig.go (+12/-0)
Branch information
Recent revisions
- 142. By John Lenton
-
The individual branches that compose this merge were peer-reviewed separately, as indicated in the commit logs.
Approved by: John Lenton - 140. By John Lenton
-
* Updated precommit script. [dev]
* Include code examples in docs (instead of repeating). [docs]
* Make tests more robust in the face of go 1.3 [client, server]
* Introduce StartClientAuthFlex for acceptance tests: Start a client
with auth, take a devId regexp, don't check any client event; support
connbroken in acceptanceclient. [server]* Cleanup and improve logging, and make log messages more
consistent. [client]* Partially work around bug lp:1390663 in a minimally intrusive way
(real fix will have to wait). [client]* Add SIGQUIT handler to spit out stack dumps; more logging
tweaks. [client, server]* Adds a couple of buttons to exercise more APIs, version bump to
0.44. [sample app]* Add APIError to server/
acceptance/ kit that includes the body for
debugging. [server]* Add DisableKeepAlives and MaxIdleConnsPerHost to the APIClient
SetupClient method. [server]* Clean up goroutines in tests. [client]
* Add an explicit check and log message for nil error on webcheck's CopyN. [client]
* Log line nums, enabled when logLevel = debug. [client server]
* Workaround gc issue with 1.3 and 32 bits. Fixes FTBFS. [client]
Approved by: John Lenton
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-push