Merge lp://staging/~pedronis/ubuntu-push/automatic-into-krillin-rtm into lp://staging/ubuntu-push/krillin-rtm
| Status: | Merged |
|---|---|
| Approved by: | Roberto Alsina |
| Approved revision: | 142 |
| Merged at revision: | 141 |
| Proposed branch: | lp://staging/~pedronis/ubuntu-push/automatic-into-krillin-rtm |
| Merge into: | lp://staging/ubuntu-push/krillin-rtm |
| Diff against target: |
6757 lines (+2552/-853) 72 files modified
.precommit (+21/-19) PACKAGE_DEPS (+1/-0) bus/accounts/accounts.go (+310/-0) bus/accounts/accounts_test.go (+271/-0) bus/connectivity/connectivity.go (+91/-32) bus/connectivity/connectivity_test.go (+129/-56) bus/connectivity/webchecker.go (+12/-3) bus/connectivity/webchecker_test.go (+9/-3) bus/endpoint.go (+10/-5) bus/haptic/haptic.go (+9/-2) bus/haptic/haptic_test.go (+35/-6) bus/networkmanager/networkmanager.go (+10/-10) bus/networkmanager/networkmanager_test.go (+23/-15) bus/notifications/raw.go (+1/-1) bus/notifications/raw_test.go (+7/-4) bus/testing/testing_endpoint.go (+85/-29) bus/testing/testing_endpoint_test.go (+38/-18) click/cappinfo/cappinfo.go (+31/-0) click/cclick/cclick.go (+1/-0) click/click.go (+4/-0) click/click_test.go (+14/-0) client/client.go (+22/-48) client/client_test.go (+69/-108) client/service/postal.go (+12/-2) client/service/postal_test.go (+17/-0) client/service/service.go (+2/-0) client/service/service_test.go (+28/-5) client/session/seenstate/seenstate.go (+6/-1) client/session/seenstate/sqlseenstate.go (+5/-0) client/session/seenstate/sqlseenstate_test.go (+9/-0) client/session/session.go (+208/-82) client/session/session_test.go (+364/-178) docs/Makefile (+4/-0) docs/_common.txt (+58/-44) docs/example-client/components/ChatClient.qml (+2/-2) docs/example-client/helloHelper-apparmor.json (+1/-0) docs/example-client/main.qml (+47/-18) docs/example-client/manifest.json (+2/-2) docs/example-server/app.js (+31/-13) docs/example-server/config/config.js (+1/-1) docs/example-server/index.html (+2/-0) docs/example-server/notify-form.html (+61/-6) docs/example-server/test/app_test.js (+128/-32) docs/highlevel.txt (+2/-2) docs/lowlevel.txt (+4/-2) launch_helper/kindpool_test.go (+1/-1) logger/logger.go (+12/-7) logger/logger_test.go (+12/-0) messaging/messaging_test.go (+14/-7) poller/poller.go (+8/-2) server/acceptance/kit/api.go (+14/-3) server/acceptance/suites/helpers.go (+8/-7) server/acceptance/suites/suite.go (+2/-1) server/api/handlers.go (+15/-1) server/api/handlers_test.go (+22/-6) server/broker/broker.go (+6/-1) server/broker/simple/simple.go (+1/-1) server/broker/simple/suite_test.go (+10/-0) server/broker/testsuite/suite.go (+31/-29) server/dev/server.go (+3/-1) server/listener/listener.go (+12/-2) server/listener/listener_test.go (+33/-6) server/runner_devices.go (+2/-2) server/runner_test.go (+5/-2) server/session/session.go (+3/-3) server/session/session_test.go (+7/-6) server/tlsconfig.go (+12/-0) sounds/sounds.go (+15/-2) sounds/sounds_test.go (+44/-3) testing/helpers.go (+9/-0) util/redialer.go (+45/-11) util/redialer_states.gv (+9/-0) |
| To merge this branch: | bzr merge lp://staging/~pedronis/ubuntu-push/automatic-into-krillin-rtm |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[Bret Barker, Samuele Pedroni]
* Partial fix of lp:1390663
- Remove SessionStateSettle sleep on wake, + more debug logging.
- Don't hold a lock for a long time on handleErrConn, trigger
autoRedial on Error more actively.
[John Lenton]
* Refactor code maintaining session (better fix for lp:1390663)
* Prune the XDG path from the beginning of accounts-set sound files.
* Use accounts' settings from sound and haptic.
* Add an explicit check and log message for nil error on webcheck's
CopyN.
* Move logging to info; improve logging of legacy helper errors;
switch some logs to error from debug.
[Bret Barker]
* Add SIGQUIT handler to spit out stack dumps; more logging
tweaks. [client, server]
* Log line nums, enabled when logLevel = debug.
[Samuele Pedroni]
* Unit test improvements
* Workaround gc issue with 1.3 and 32 bits.
[Roberto Ralsina]
* Example and docs improvements.
[ Guillermo Gonzalez ]
* When The server reply 401 on /register, make the DBus call to Register
return ErrBadAuth instead of ErrBadRequest.
* Fix click hook for legacy apps
* Add ClearCookie method to the session and call it from handleAccountsC
* click.AppId.
and then fallback to icon+"-symbolic"
| Roberto Alsina (ralsina) | # |
