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

[Niklas Wenzel]

Fix typo

Fix typo

[Niklas Wenzel (nikwen)]

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)]

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: Needs Resubmitting

[Niklas Wenzel (nikwen)]

review: Approve

[Niklas Wenzel (nikwen)]

What's about this one?

[Sergio Schvezov (sergiusens)]

review: Approve

[Niklas Wenzel (nikwen)]

Thanks for approving. :)

[Jonas G. Drange (jonas-drange)]

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

review: Approve

[Niklas Wenzel (nikwen)]

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

=== modified file 'cmd/account-polld/account_manager.go'
--- cmd/account-polld/account_manager.go	2014-10-02 13:58:49 +0000
+++ cmd/account-polld/account_manager.go	2014-10-19 09:47:18 +0000
@@ -76,7 +76,7 @@
 	}
 
 	if a.penaltyCount > 0 {
-		log.Printf("Leaving poll for account %d as penaly count is %d", a.authData.AccountId, a.penaltyCount)
+		log.Printf("Leaving poll for account %d as penalty count is %d", a.authData.AccountId, a.penaltyCount)
 		a.penaltyCount--
 		return
 	}