git.postgresql.org Git - users/andresfreund/postgres.git/commit - git.postgresql.org

projects / users / andresfreund / postgres.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c9a3b39 3c4210c)

author	Andres Freund <andres@anarazel.de>
	Sun, 8 Dec 2013 18:30:30 +0000 (19:30 +0100)
committer	Andres Freund <andres@anarazel.de>
	Sun, 8 Dec 2013 18:30:30 +0000 (19:30 +0100)
commit	bcc111df21e5a68d4f41381720e41d35ddff5994
tree	ca92520cfba59c55fd97495037394913237a6ca5	tree
parent	c9a3b39a1427746137447d1f5c6ee0a994944b4b	commit \| diff
parent	3c4210c3e7502168b01bf1a80f6be6d72396ee64	commit \| diff

Merge branch 'commit_ts' into HEAD

* commit_ts:
committs 0.4

Conflicts:
src/backend/utils/misc/postgresql.conf.sample

14 files changed:

doc/src/sgml/config.sgml	diff1 \|	diff2 \|	blob \| history
src/backend/access/rmgrdesc/xlogdesc.c	diff1 \|	diff2 \|	blob \| history
src/backend/access/transam/xact.c	diff1 \|	diff2 \|	blob \| history
src/backend/access/transam/xlog.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/vacuum.c	diff1 \|	diff2 \|	blob \| history
src/backend/storage/ipc/ipci.c	diff1 \|	diff2 \|	blob \| history
src/backend/storage/ipc/procarray.c	diff1 \|	diff2 \|	blob \| history
src/backend/utils/misc/guc.c	diff1 \|	diff2 \|	blob \| history
src/backend/utils/misc/postgresql.conf.sample	diff1 \|	diff2 \|	blob \| history
src/bin/initdb/initdb.c	diff1 \|	diff2 \|	blob \| history
src/bin/pg_controldata/pg_controldata.c	diff1 \|	diff2 \|	blob \| history
src/include/access/transam.h	diff1 \|	diff2 \|	blob \| history
src/include/catalog/pg_proc.h	diff1 \|	diff2 \|	blob \| history
src/include/storage/lwlock.h	diff1 \|	diff2 \|	blob \| history

Andres' PG stuff