Merge remote-tracking branch 'origin/master' into csn
authorHeikki Linnakangas <[email protected]>
Mon, 19 May 2014 14:26:01 +0000 (17:26 +0300)
committerHeikki Linnakangas <[email protected]>
Mon, 19 May 2014 14:31:26 +0000 (17:31 +0300)
commit9d9fdefa42e3bb2be4e5b3f82107d7c285fbb06b
tree519d384e6e7cebe4fde883726a33dadc2e642f0f
parentab289a925fdcbf883ff8ed1f251f97403fc7a941
parentf097d70b7227c1f9aa2ed0af1d6deb05367ef657
Merge remote-tracking branch 'origin/master' into csn

Conflicts:
src/backend/utils/adt/txid.c
src/test/regress/expected/txid.out
src/test/regress/sql/txid.sql
doc/src/sgml/func.sgml
src/backend/access/heap/heapam.c
src/backend/access/transam/README
src/backend/access/transam/twophase.c
src/backend/access/transam/xact.c
src/backend/access/transam/xlog.c
src/backend/replication/logical/decode.c
src/backend/replication/logical/reorderbuffer.c
src/backend/utils/adt/txid.c
src/test/regress/sql/txid.sql