Merge branch 'master' into hot_standby
authorSimon Riggs <simon@2ndQuadrant.com>
Tue, 6 Oct 2009 17:23:11 +0000 (18:23 +0100)
committerSimon Riggs <simon@2ndQuadrant.com>
Tue, 6 Oct 2009 17:23:11 +0000 (18:23 +0100)
commitc33496dcacf21d0b7bbf3a6b9222d9116eda605b
tree48c7cbf30b1c637ce53bab36462f67b3d9e8fc4c
parenta09cf45d7764076b2049071b1cc81717cc6384f8
parente537ef80262ede8bb0b721129a1709681e0271a6
Merge branch 'master' into hot_standby
doc/src/sgml/config.sgml
src/backend/access/nbtree/nbtinsert.c
src/backend/tcop/utility.c
src/backend/utils/misc/guc.c
src/include/catalog/pg_proc.h