[pgpool-committers: 373] 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:
	pool_process_reporting.c

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

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

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