pgpool2.git / summary / log / commit / refs

commit    cafefd130cce92021523ec8a5a7e270e8219ab98
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Thu May 16 04:17:39 2013 +0000

    Merge branch 'master' of ssh://git.postgresql.org/pgpool2


 doc/pgpool-en.html                    | 409 ++++++++++++++++++++++----------
 doc/pgpool-ja.html                    | 432 +++++++++++++++++++++++++---------
 pgpool.conf.sample                    | 108 ++++++---
 pgpool.conf.sample-master-slave       | 107 ++++++---
 pgpool.conf.sample-replication        | 107 ++++++---
 pgpool.conf.sample-stream             | 107 ++++++---
 pool_config.c                         |  62 ++---
 pool_config.h                         |  27 ++-
 pool_config.l                         |  62 ++---
 pool_process_reporting.c              |  38 +--
 watchdog/Makefile.am                  |   2 +-
 watchdog/Makefile.in                  |   6 +-
 watchdog/watchdog.c                   |  78 +++---
 watchdog/watchdog.h                   |  12 +-
 watchdog/wd_ext.h                     |  14 +-
 wd_heartbeat.c} | 170 ++++++-------
 watchdog/wd_init.c                    |   4 +-
 watchdog/wd_lifecheck.c               |  48 ++--
 watchdog/wd_list.c                    |   4 +-
 19 files changed, 1162 insertions(+), 635 deletions(-)


[parent: e7a8350e6abf]