Merge trunk revision 2638:

r2638 | asalkeld | 2009-12-08 00:48:53 -0700 (Tue, 08 Dec 2009) | 2 lines

Allow empty (default) consensus timeout.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2686 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/totemconfig.c

@@ -559,7 +559,7 @@ int totem_config_validate (
 		goto parse_error;
 	}
 
-	if (totem_config->consensus_timeout <= 1.2 * totem_config->token_timeout) {
+	if (totem_config->consensus_timeout < 1.2 * totem_config->token_timeout) {
 		snprintf (local_error_reason, sizeof(local_error_reason),
 			"The consensus timeout parameter (%d ms) must be atleast 1.2 * token (%d ms).",
 			totem_config->consensus_timeout, (int) ((float)1.2 * totem_config->token_timeout));