lp:~rsalveti/ubuntu-push/merge-automatic-branch
- Get this branch:
- bzr branch lp:~rsalveti/ubuntu-push/merge-automatic-branch
Branch merges
- Samuele Pedroni: Approve
-
Diff: 1246 lines (+572/-99)24 files modifiedLICENSE (+1/-1)
bus/connectivity/connectivity_test.go (+4/-0)
bus/endpoint.go (+43/-0)
bus/testing/testing_endpoint.go (+10/-0)
bus/testing/testing_endpoint_test.go (+19/-0)
bus/urfkill/urfkill.go (+70/-6)
bus/urfkill/urfkill_test.go (+107/-10)
click/cclick/cclick.go (+1/-1)
client/service/postal_test.go (+5/-2)
client/session/session.go (+18/-0)
client/session/session_test.go (+42/-9)
debian/changelog (+16/-0)
launch_helper/kindpool.go (+5/-0)
poller/poller.go (+15/-16)
poller/poller_test.go (+12/-6)
server/acceptance/acceptanceclient.go (+13/-7)
server/acceptance/kit/api.go (+1/-0)
server/acceptance/kit/cliloop.go (+3/-0)
server/acceptance/ssl/README (+3/-3)
server/acceptance/ssl/testing.cert (+17/-8)
server/acceptance/ssl/testing.key (+28/-9)
server/broker/broker.go (+14/-1)
server/broker/broker_test.go (+18/-0)
testing/tls.go (+107/-20)
Branch information
Recent revisions
- 144. By Samuele Pedroni
-
[Roberto Alsina]
* click-hook: report failure if hooks_path doesn't exist. [client][Bret Barker]
* add a hacky busy sleep loop to workaround go's sleep not
accounting for suspended time, more logging (lp:1435109). [client][John R. Lenton]
* Refactor code maintaining session (better fix for lp:1390663) [client][Samuele Pedroni]
* just delegate whether there's a update-worthy image to the
system-settings helper and system-image. [client]
* stop waking up for polling if in flight-mode and wireless not
enabled (lp:1437135). [client]
* don't hold a lock for a long time on handleErrConn, trigger
autoRedial on Error more actively (lp:1435109). [client]
* disallow RC4 and SSLv3. [server]
Approved by: Roberto Alsina - 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