[pgpool-committers: 491] pgpool: Merged watchdog branch with master.

[at.mitani]

Merged watchdog branch with master.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=9896acb459e0c8a377604d5c6ba5f13d172e91c3

Modified Files
--------------
doc/wd-en.html                  |    7 +++++
doc/wd-ja.html                  |    7 +++++
main.c                          |   17 ++++++++++++-
pgpool.conf                     |    2 +
pgpool.conf.sample              |    2 +
pgpool.conf.sample-master-slave |    2 +
pgpool.conf.sample-replication  |    2 +
pgpool.conf.sample-stream       |    2 +
pool_config.c                   |   52 ++++++++++++++++++++++++++++++++------
pool_config.h                   |    1 +
pool_config.l                   |   52 ++++++++++++++++++++++++++++++++------
watchdog/wd_init.c              |    2 +-
watchdog/wd_packet.c            |    2 +-
13 files changed, 129 insertions(+), 21 deletions(-)