diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:35:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:52:25 +0200 |
| commit | c6c4e39b012d544c1f1ed816686c8ae1599da793 (patch) | |
| tree | 094d5e07c1d135d0ee67d99e051fd6a9a367a6a4 /clients/cloud-setup/nmcs-provider-ec2.c | |
| parent | 7368e45ff5b3b8b328d55408bcd403e4d6c564d0 (diff) | |
| parent | acd7b014c72673f5b0c0b91309e27028886da167 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'clients/cloud-setup/nmcs-provider-ec2.c')
| -rw-r--r-- | clients/cloud-setup/nmcs-provider-ec2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clients/cloud-setup/nmcs-provider-ec2.c b/clients/cloud-setup/nmcs-provider-ec2.c index 82ed0949..c8db31f9 100644 --- a/clients/cloud-setup/nmcs-provider-ec2.c +++ b/clients/cloud-setup/nmcs-provider-ec2.c @@ -138,6 +138,7 @@ detect (NMCSProvider *provider, 256*1024, 7000, 1000, + NULL, g_task_get_cancellable (task), _detect_get_meta_data_check_cb, NULL, @@ -396,6 +397,7 @@ _get_config_metadata_ready_cb (GObject *source, 512*1024, 10000, 1000, + NULL, iface_data->cancellable, NULL, NULL, @@ -413,6 +415,7 @@ _get_config_metadata_ready_cb (GObject *source, 512*1024, 10000, 1000, + NULL, iface_data->cancellable, NULL, NULL, @@ -529,6 +532,7 @@ get_config (NMCSProvider *provider, 256 * 1024, 15000, 1000, + NULL, g_task_get_cancellable (get_config_data->task), _get_config_metadata_ready_check, metadata_data, |