[Merge] lp:~ken-vandine/friends/lp1248143 into lp:friends

[Ken VanDine]

Ken VanDine has proposed merging lp:~ken-vandine/friends/lp1248143 into lp:friends.

Commit message:
Undo revert for the default polling frequency and ensure interval is set before using it in the timeout.

Requested reviews:
  Super Friends (super-friends)
Related bugs:
  Bug #1238083 in friends (Ubuntu): "friends-dispatcher is a little busy doing data updates on idle systems"
  https://bugs.launchpad.net/ubuntu/+source/friends/+bug/1238083
  Bug #1248143 in friends (Ubuntu): "the fix for Bug #1238083 seems to cause the systemsettle tests on mako to fail, blocking image releases"
  https://bugs.launchpad.net/ubuntu/+source/friends/+bug/1248143

For more details, see:
https://code.launchpad.net/~ken-vandine/friends/lp1248143/+merge/193990

Undo revert for the default polling frequency and ensure interval is set before using it in the timeout.

-- 
https://code.launchpad.net/~ken-vandine/friends/lp1248143/+merge/193990
Your team Super Friends is requested to review the proposed merge of lp:~ken-vandine/friends/lp1248143 into lp:friends.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1842 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20131105/8ff41c91/attachment.diff>