Merge lp:~mir-team/dbus-cpp/fix-1361642-with-30sec-timeout into lp:dbus-cpp

Proposed by kevin gunn on 2014-10-29
Status: Merged
Approved by: Antti Kaijanmäki on 2014-10-29
Approved revision: 79
Merged at revision: 84
Proposed branch: lp:~mir-team/dbus-cpp/fix-1361642-with-30sec-timeout
Merge into: lp:dbus-cpp
Diff against target: 29 lines (+3/-3)
1 file modified
include/core/dbus/interfaces/properties.h (+3/-3)
To merge this branch: bzr merge lp:~mir-team/dbus-cpp/fix-1361642-with-30sec-timeout
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2014-10-29
Antti Kaijanmäki (community) 2014-10-29 Approve on 2014-10-29
Review via email: mp+240045@code.launchpad.net

Commit message

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}. with timeout set to 30 sec

Description of the change

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}. with timeout set to 30 sec

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/core/dbus/interfaces/properties.h'
2--- include/core/dbus/interfaces/properties.h 2014-01-20 21:22:02 +0000
3+++ include/core/dbus/interfaces/properties.h 2014-10-29 19:26:27 +0000
4@@ -45,7 +45,7 @@
5 };
6 inline static const std::chrono::milliseconds default_timeout()
7 {
8- return std::chrono::seconds{1};
9+ return std::chrono::seconds{30};
10 }
11 };
12
13@@ -59,7 +59,7 @@
14 };
15 inline static const std::chrono::milliseconds default_timeout()
16 {
17- return std::chrono::seconds{1};
18+ return std::chrono::seconds{30};
19 }
20 };
21
22@@ -73,7 +73,7 @@
23 };
24 inline static const std::chrono::milliseconds default_timeout()
25 {
26- return std::chrono::seconds{1};
27+ return std::chrono::seconds{30};
28 }
29 };
30

Subscribers

People subscribed via source and target branches