[glib] (4 commits) Non-fast-forward update to branch wip/rishi/gtask-return-cancelled

[Philip Withnall <pwithnall src gnome org>]

The branch 'wip/rishi/gtask-return-cancelled' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  f0f4cd1... gtask: Return cancelled tasks asynchronously
  54e6a0b... gio/tests/task: Ensure that cancelled tasks are returned as

Commits added to the branch:

  cffed58... tests: Tag socket-service test as ‘flaky’ (*)
  0f8a4f6... Merge branch 'socket-service-flaky' into 'master' (*)
  6f3d57d... gtask: Return cancelled tasks asynchronously
  381af21... gio/tests/task: Ensure that cancelled tasks are returned as

(*) This commit already existed in another branch; no separate mail sent