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

author Yugo Nagata <nagata@sraoss.co.jp>

Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)

committer Yugo Nagata <nagata@sraoss.co.jp>

Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)
author Yugo Nagata <nagata@sraoss.co.jp>
Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)
committer Yugo Nagata <nagata@sraoss.co.jp>
Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)
diff --cc pgpool.conf.sample-master-slave
Simple merge
diff --cc pgpool.conf.sample-replication
Simple merge
diff --cc pgpool.conf.sample-stream
Simple merge
author	Yugo Nagata <nagata@sraoss.co.jp>
	Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)
committer	Yugo Nagata <nagata@sraoss.co.jp>
	Wed, 15 May 2013 07:13:52 +0000 (16:13 +0900)
		1	2
pgpool.conf.sample-master-slave	patch \|	diff1 \|	diff2 \|	blob \| history
pgpool.conf.sample-replication	patch \|	diff1 \|	diff2 \|	blob \| history
pgpool.conf.sample-stream	patch \|	diff1 \|	diff2 \|	blob \| history