Merge branch 'feature/watchdog_for_v3_3' Conflicts: pool_config.c Branch ------ master Details ------- http://git.postgresql.org/gitweb?p=pgpool2.git;a=commitdiff;h=4bb4cd5818834c9987b7363eafa0d7360b4742e7 Modified Files --------------