[pgpool-committers: 370] pgpool: Merge branch 'feature/watchdog' of ssh://git.postgresql.org/pgp

[At Mitani]

Merge branch 'feature/watchdog' of ssh://git.postgresql.org/pgpool2 into /feature/watchdog

Conflicts:
	watchdog/Makefile.in
	watchdog/watchdog.c
	watchdog/watchdog.h
	watchdog/wd_child.c
	watchdog/wd_ext.h
	watchdog/wd_if.c
	watchdog/wd_init.c
	watchdog/wd_lifecheck.c
	watchdog/wd_list.c
	watchdog/wd_packet.c
	watchdog/wd_ping.c

Branches
--------
feature/watchdog
master

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

Modified Files
--------------