Merge lp:~marcustomlinson/unity-scopes-api/merge_trunk into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Sync trunk with devel

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1224/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/777
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/777/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/776

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1224/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

This sync is seriously harmless, I'm gonna go ahead and merge.

review: Approve

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-10-01 14:00:06 +0000
+++ RELEASE_NOTES.md	2014-10-16 05:31:07 +0000
@@ -3,8 +3,10 @@
 
 Changes in version 0.6.7
 ========================
-  - Added new RunInExternalUiMainLoop option to OnlineAccountClient::MainLoopSelect.
-  - OnlineAccountClient signon UI policy determined by main loop used (shell: show / scope: hide).
+  - OnlineAccountClient fixes: run the internal event loop within its own context to avoid
+    clashing with external main loop (LP: #1377147).
+  - Introduced new dependencies on dbus-test-runner and libdbustest1-dev.
+  - Fix for Zmq infinite reconnection problem (LP: #1374206)
 
 Changes in version 0.6.6
 ========================
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-10-09 16:20:17 +0000
+++ debian/changelog	2014-10-16 05:31:07 +0000
@@ -1,9 +1,15 @@
-unity-scopes-api (0.6.7-0ubuntu1) UNRELEASED; urgency=medium
-
-  * Added new RunInExternalUiMainLoop option to OnlineAccountClient::MainLoopSelect.
-  * OnlineAccountClient signon UI policy determined by main loop used (shell: show / scope: hide).
-
- -- Marcus Tomlinson <[e-mail]>  Wed, 01 Oct 2014 15:46:30 +0200
+unity-scopes-api (0.6.7+14.10.20141010.1-0ubuntu1) utopic; urgency=medium
+
+  [ Marcus Tomlinson ]
+  * OnlineAccountClient fixes: run the internal event loop within its own context to avoid
+    clashing with external main loop (LP: #1377147).
+  * Introduced new dependencies on dbus-test-runner and libdbustest1-dev.
+  * Fix for Zmq infinite reconnection problem (LP: #1374206)
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+ -- Ubuntu daily release <[e-mail]>  Fri, 10 Oct 2014 19:24:20 +0000
 
 unity-scopes-api (0.6.6+14.10.20141006-0ubuntu1) utopic; urgency=medium