Merge commit 'origin/master' into recoveryinfra
authorHeikki Linnakangas <heikki@enterprisedb.com>
Mon, 23 Feb 2009 07:53:26 +0000 (09:53 +0200)
committerHeikki Linnakangas <heikki@enterprisedb.com>
Mon, 23 Feb 2009 07:53:26 +0000 (09:53 +0200)
commit30f96acd1a4ca704100c7b836a58e9ef3dc17b95
treef4011ddafe610f4a9898962ab4785093629607b5
parent4fd212090fd1bbdb5631001f9e96564f8fffe9fd
parente05ec7efd152c05691510e72c19b3326710e61f9
Merge commit 'origin/master' into recoveryinfra

Conflicts:

src/backend/access/transam/xlog.c
src/backend/postmaster/postmaster.c
src/include/storage/pmsignal.h
src/backend/access/transam/xlog.c