* fix bug in pgpool.monitor arguments.

diff --git a/ChangeLog b/ChangeLog
index 8d7b4a26ce8802293fdc682f378e1da7a357dbc7..afcb2be6a6c2c37a6cebf620670e1864d8a03199 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010/11/8
+       * fix bug in pgpool.monitor arguments.
+
 2010/1/18
        * add "pgpooluser" parameter
 
@@ -7,7 +10,7 @@
        * renew sample cib.xml tested on heartbeat 2.1.4, pgpool-II 2.1
        * pipe expression was able to be used at "logfile"
        * make pgpool.in always use "pgpool stop -m immediate" to (stop)
-    * add "options" parameter
+       * add "options" parameter
 
 2007/6/XX release 1.1
        * fix ocf script to work properly with pgpool 3.2+ .

diff --git a/doc/pgpool-ha.en.txt b/doc/pgpool-ha.en.txt
index 55ef2d6750e3a9b6b6520a3d24c63011ebcc5e8d..1c6320d3e75cc8739c22d3717c7e5a8a9295d8e5 100644 (file)
--- a/doc/pgpool-ha.en.txt
+++ b/doc/pgpool-ha.en.txt
@@ -15,7 +15,7 @@ This software contains:
 2. Requirement
 
 - heartbeat
- 2.0+ required.  (Tested on 2.1.4 only)
+ 2.0+ required.
 
 - pgpool
  Tested on pgpool-II only , but It will work if 'show pool_status' command

diff --git a/src/pgpool.in b/src/pgpool.in
index 95c85ad8097746b86a6c576e40f4b2fa5af708a5..0ae707bdc65b53b5ca48876427518fc473f4c5d9 100755 (executable)
--- a/src/pgpool.in
+++ b/src/pgpool.in
@@ -4,7 +4,7 @@
 #
 # Author: TANIDA Yutaka, TAKATSUKA Haruka
 #
-# Copyright (c) 2006-2009           PgPool Global Development Group 
+# Copyright (c) 2006-2010           PgPool Global Development Group 
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -96,7 +96,7 @@ fi
 PGPOOL_STOP_ARG=" stop"
 PGPOOL_FORCE_STOP_ARG=" -m i $PGPOOL_STOP_ARG"
 PGPOOL_MONITOR=${PGPOOLCMD}.monitor 
-PGPOOL_MONITOR_ARGS=--conf=$PGP_CONF localhost >/dev/null 2>&1
+PGPOOL_MONITOR_ARGS="--conf=$PGP_CONF localhost >/dev/null 2>&1"
 
 # Source function library.
 . ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs