pgpool2.git / summary / log / commit / refs
commit 474b486026a8df011448ebcd8c2fb9ca3fd8c09d
Author: at.mitani <at.mitani@gmail.com>
Date: Sat Jun 09 08:41:51 2012 +0000
Merge branch 'feature/watchdog' of ssh://git.postgresql.org/pgpool2 into feature/watchdog
Conflicts:
pool_process_reporting.c
Makefile.am | 4 +-
Makefile.in | 10 +-
aclocal.m4 | 4 +-
configure | 3239 ++++++++++------
configure.in | 2 +-
doc/wd-ja.html | 148 +
doc/wd-ja.jpg | Bin 0 -> 71978 bytes
ltmain.sh | 8407 +---------------------------------------
m4/libtool.m4 | 7361 +----------------------------------
m4/ltoptions.m4 | 369 +-
m4/ltversion.m4 | 24 +-
m4/lt~obsolete.m4 | 93 +-
main.c | 31 +-
parser/Makefile.in | 4 +-
pcp/Makefile.in | 4 +-
pcp/md5.c | 445 +--
pcp/md5.h | 28 +-
pcp_child.c | 4 +-
pgpool.conf.sample | 39 +
pool.h | 10 +
pool_config.c | 257 ++
pool_config.h | 21 +
pool_config.l | 257 ++
pool_memqcache.c | 96 +-
pool_process_query.c | 8 +-
pool_process_reporting.c | 124 +-
pool_proto_modules.c | 18 +-
recovery.c | 16 +-
watchdog/Makefile.am | 15 +
watchdog/Makefile.in | 502 +++
watchdog/test/stab.c | 266 ++
watchdog/test/test.c | 85 +
watchdog/test/wd_child_t.c | 87 +
watchdog/test/wd_lifecheck_t.c | 87 +
watchdog/test/wd_packet_t.c | 87 +
watchdog/test/wd_ping_t.c | 20 +
watchdog/watchdog.c | 161 +
watchdog/watchdog.h | 130 +
watchdog/wd_child.c | 234 ++
watchdog/wd_ext.h | 74 +
watchdog/wd_if.c | 144 +
watchdog/wd_init.c | 91 +
watchdog/wd_lifecheck.c | 253 ++
watchdog/wd_list.c | 169 +
watchdog/wd_packet.c | 857 ++++
watchdog/wd_ping.c | 228 ++
46 files changed, 6489 insertions(+), 18024 deletions(-)
[parent: afbe7722978d]