[Cluster-devel] conga ./clustermon.spec.in.in make/version.in ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2008-07-03 15:01:28

Modified files:
	.              : clustermon.spec.in.in 
	make           : version.in 
	ricci/modules/cluster/clumon/src/common: ClusterMonitor.cpp 

Log message:
	fix bz453961

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.14&r2=1.25.2.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.14&r2=1.28.2.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.2.4.2&r2=1.2.4.3

--- conga/clustermon.spec.in.in	2008/04/18 03:31:46	1.25.2.14
+++ conga/clustermon.spec.in.in	2008/07/03 15:01:26	1.25.2.15
@@ -194,6 +194,9 @@
 
 
 %changelog
+* Thu Jul 03 2008 Ryan McCabe <rmccabe at redhat.com> 0.11.2-1
+- Fix bz453961 (cluster-snmp deadlocks snmpd)
+
 * Tue Apr 15 2008 Ryan McCabe <rmccabe at redhat.com> 0.11.1-3
 - Fix bz441966 (cluster-snmp dlopen failure)
  
--- conga/make/version.in	2008/05/12 17:09:53	1.28.2.14
+++ conga/make/version.in	2008/07/03 15:01:27	1.28.2.15
@@ -1,2 +1,2 @@
-VERSION=0.11.1
-RELEASE=5
+VERSION=0.11.2
+RELEASE=1
--- conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp	2008/03/25 01:27:18	1.2.4.2
+++ conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp	2008/07/03 15:01:27	1.2.4.3
@@ -42,6 +42,8 @@
 	try {
 		ClientSocket sock(_sock_path);
 
+		sock.nonblocking(true);
+
 		if(sock.send("GET").size())
 			throw int();