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

Proposed by kevin gunn
Status: Merged
Approved by: Antti Kaijanmäki
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
Antti Kaijanmäki (community) Approve
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.
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/core/dbus/interfaces/properties.h'
--- include/core/dbus/interfaces/properties.h 2014-01-20 21:22:02 +0000
+++ include/core/dbus/interfaces/properties.h 2014-10-29 19:26:27 +0000
@@ -45,7 +45,7 @@
45 };45 };
46 inline static const std::chrono::milliseconds default_timeout()46 inline static const std::chrono::milliseconds default_timeout()
47 {47 {
48 return std::chrono::seconds{1};48 return std::chrono::seconds{30};
49 }49 }
50 };50 };
5151
@@ -59,7 +59,7 @@
59 };59 };
60 inline static const std::chrono::milliseconds default_timeout()60 inline static const std::chrono::milliseconds default_timeout()
61 {61 {
62 return std::chrono::seconds{1};62 return std::chrono::seconds{30};
63 }63 }
64 };64 };
6565
@@ -73,7 +73,7 @@
73 };73 };
74 inline static const std::chrono::milliseconds default_timeout()74 inline static const std::chrono::milliseconds default_timeout()
75 {75 {
76 return std::chrono::seconds{1};76 return std::chrono::seconds{30};
77 }77 }
78 };78 };
7979

Subscribers

People subscribed via source and target branches