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

[at.mitani]

watchdog branch merged with master.

Branch
------
feature/watchdog

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

Modified Files
--------------
Makefile.in                     |    5 +-
NEWS                            | 2464 +++++++++-----
aclocal.m4                      |    4 +-
configure                       | 3236 ++++++++++++-------
configure.in                    |    2 +-
doc/pgpool-en.html              |  292 ++-
doc/pgpool-ja.html              | 6995 ++++++++++++++++++++++-----------------
doc/pgpool-zh_cn.html           |  379 ++-
main.c                          |   86 +-
parser/Makefile.in              |    4 +-
parser/gram.c                   | 3554 ++++++++++----------
parser/gram.h                   |   13 +-
pcp/Makefile.in                 |    4 +-
pgpool.conf.sample              |    3 +-
pgpool.conf.sample-master-slave |   45 +
pgpool.conf.sample-replication  |   45 +
pgpool.conf.sample-stream       |   45 +
pool_memqcache.c                |    6 +
pool_memqcache.h                |    3 +
pool_process_query.c            |   21 +-
pool_proto_modules.c            |    4 +
recovery.c                      |    2 +-
version.h                       |    2 +-
watchdog/Makefile.in            |    4 +-
24 files changed, 10176 insertions(+), 7042 deletions(-)