Merge branch 'commit_ts' into HEAD

* commit_ts:
  committs 0.4

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

diff --cc doc/src/sgml/config.sgml
Simple merge

diff --cc src/backend/access/rmgrdesc/xlogdesc.c
Simple merge

diff --cc src/backend/access/transam/xact.c
Simple merge

diff --cc src/backend/access/transam/xlog.c
index 50c724aeeb5ebefc5efb4a52d2986f10859b58e7,2470daa1bc42de81ceba2c19bfdec624587c44b3..7a7d306df8c6594fb3e03a4d44ed398537fe7f48
--- 1/src/backend/access/transam/xlog.c
--- 2/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -22,8 -22,8 +22,9 @@@
  #include <unistd.h>
  
  #include "access/clog.h"
+ #include "access/committs.h"
  #include "access/multixact.h"
 +#include "access/rewriteheap.h"
  #include "access/subtrans.h"
  #include "access/timeline.h"
  #include "access/transam.h"

diff --cc src/backend/commands/vacuum.c
Simple merge

diff --cc src/backend/storage/ipc/ipci.c
Simple merge

diff --cc src/backend/storage/ipc/procarray.c
Simple merge

diff --cc src/backend/utils/misc/guc.c
Simple merge

diff --cc src/backend/utils/misc/postgresql.conf.sample
index dfbb8e7b6e7c5b2f1ee331ebc469b3fd7f9869c6,ea06f2179bf93ce7a1f152a867ecd0bc2712884d..5f3236c2b6d5c331a7b7be6e60f345dd39788d81
--- 1/src/backend/utils/misc/postgresql.conf.sample
--- 2/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@@ -222,10 -221,7 +222,12 @@@
  #wal_keep_segments = 0        # in logfile segments, 16MB each; 0 disables
  #wal_sender_timeout = 60s # in milliseconds; 0 disables
  
 +#max_logical_slots = 0        # max number of logical replication sender
 +              # and receiver processes. Logical senders
 +              # (but not receivers) also consume a
 +              # max_wal_senders slot.
++
+ #track_commit_timestamp = off # collect timestamp of transaction commit
                # (change requires restart)
  
  # - Master Server -

diff --cc src/bin/initdb/initdb.c
Simple merge

diff --cc src/bin/pg_controldata/pg_controldata.c
Simple merge

diff --cc src/include/access/transam.h
Simple merge

diff --cc src/include/catalog/pg_proc.h
Simple merge

diff --cc src/include/storage/lwlock.h
Simple merge