Merge lp://staging/~ralsina/ubuntu-push/merge-automatic into lp://staging/ubuntu-push
Proposed by
Roberto Alsina
Status: | Merged |
---|---|
Approved by: | Roberto Alsina |
Approved revision: | no longer in the source branch. |
Merged at revision: | 131 |
Proposed branch: | lp://staging/~ralsina/ubuntu-push/merge-automatic |
Merge into: | lp://staging/ubuntu-push |
Diff against target: |
934 lines (+296/-151) 23 files modified
bus/unitygreeter/unitygreeter.go (+52/-0) client/service/postal.go (+14/-0) client/service/postal_test.go (+15/-11) client/session/session_test.go (+4/-25) debian/changelog (+7/-0) docs/example-client/main.qml (+8/-0) docs/example-client/manifest.json (+2/-2) sampleconfigs/dev.json (+1/-1) server/acceptance/acceptance_test.go (+1/-1) server/acceptance/ssl/README (+1/-1) server/acceptance/ssl/testing.cert (+7/-7) server/acceptance/ssl/testing.key (+7/-7) server/acceptance/suites/broadcast.go (+1/-1) server/acceptance/suites/suite.go (+1/-1) server/config_test.go (+12/-11) server/dev/server.go (+2/-2) server/listener/listener.go (+4/-13) server/listener/listener_test.go (+9/-17) server/runner_devices.go (+2/-29) server/runner_http.go (+6/-1) server/runner_test.go (+45/-6) server/tlsconfig.go (+53/-0) testing/tls.go (+42/-15) |
To merge this branch: | bzr merge lp://staging/~ralsina/ubuntu-push/merge-automatic |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
Review via email: mp+234136@code.staging.launchpad.net |
Commit message
Updates from the automatic branch
Description of the change
Updates from the automatic branch
To post a comment you must log in.