[pgpool-committers: 481] pgpool: merged master with the watchdog branch.

[at.mitani]

merged master with the watchdog branch.

Branch
------
master

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

Modified Files
--------------
pool_config.c           |   48 +++++++++++++++++++++++++++++++++++++++++++++++
pool_config.l           |   48 +++++++++++++++++++++++++++++++++++++++++++++++
recovery.c              |   13 ++++++++---
watchdog/watchdog.c     |    3 ++
watchdog/wd_child.c     |    7 +++++-
watchdog/wd_ext.h       |    1 +
watchdog/wd_if.c        |    4 +-
watchdog/wd_init.c      |    1 +
watchdog/wd_lifecheck.c |   15 ++++++++++++++
watchdog/wd_packet.c    |   30 ++++++++++++++++++++++------
10 files changed, 156 insertions(+), 14 deletions(-)