Commit f1bcedba authored by Christophe Massiot's avatar Christophe Massiot

Merge branch 'quarium-multilive'

parents d50d3d06 d622c1ee
......@@ -315,9 +315,14 @@ int main( int i_argc, char **pp_argv )
if ( announce_get_priority(p_buffer) < i_priority )
{
/* Do not take over immediately to avoid fighting with
* potential other idle nodes. */
i_master_expiration = i_current_date + i_master_expiration_skew;
if ( i_current_date + i_master_expiration_skew <
i_master_expiration )
{
/* Do not take over immediately to avoid fighting with
* potential other idle nodes. */
i_master_expiration =
i_current_date + i_master_expiration_skew;
}
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment