Merge lp:~nikwen/account-polld/fix-typo into lp:~ubuntu-push-hackers/account-polld/trunk

Proposed by Niklas Wenzel on 2014-10-19
Status: Approved
Approved by: Jonas G. Drange on 2015-11-04
Approved revision: 100
Proposed branch: lp:~nikwen/account-polld/fix-typo
Merge into: lp:~ubuntu-push-hackers/account-polld/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
cmd/account-polld/account_manager.go (+1/-1)
To merge this branch: bzr merge lp:~nikwen/account-polld/fix-typo
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Approve on 2015-11-04
Sergio Schvezov 2014-10-19 Approve on 2015-03-30
Niklas Wenzel (community) Approve on 2014-10-20
Review via email: mp+238816@code.launchpad.net

Commit message

Fix typo

Description of the change

Fix typo

To post a comment you must log in.
Niklas Wenzel (nikwen) wrote :

Ok, please don't merge this. I'm working on some bug fixes as I explained here: https://lists.launchpad.net/ubuntu-phone/msg10265.html
As one of the fixes is closely related to the error handling in that line, I'll change it in that merge proposal. Changing it separately will just cause merge conflicts.

review: Disapprove
Niklas Wenzel (nikwen) wrote :

Since I was asked to split the following merge proposal this open for review again: https://code.launchpad.net/~nikwen/account-polld/error-handling-fixes/+merge/238875

review: Resubmit
Niklas Wenzel (nikwen) :
review: Approve
Niklas Wenzel (nikwen) wrote :

What's about this one?

review: Approve
Niklas Wenzel (nikwen) wrote :

Thanks for approving. :)

Jonas G. Drange (jonas-drange) wrote :

Let's merge it to automatic now, and put it into OTA9 or the next account-polld release.

review: Approve
Niklas Wenzel (nikwen) wrote :

Let's just get it in with the next release. This MP has been waiting that long already, the typo probably won't do as much harm as it requires effort to land this on its own. ;)

Thank you for approving though. :D

Unmerged revisions

100. By Niklas Wenzel on 2014-10-19

Fix typo

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/account-polld/account_manager.go'
2--- cmd/account-polld/account_manager.go 2014-10-02 13:58:49 +0000
3+++ cmd/account-polld/account_manager.go 2014-10-19 09:47:18 +0000
4@@ -76,7 +76,7 @@
5 }
6
7 if a.penaltyCount > 0 {
8- log.Printf("Leaving poll for account %d as penaly count is %d", a.authData.AccountId, a.penaltyCount)
9+ log.Printf("Leaving poll for account %d as penalty count is %d", a.authData.AccountId, a.penaltyCount)
10 a.penaltyCount--
11 return
12 }

Subscribers

People subscribed via source and target branches