From: Andres Freund <andres@anarazel.de>
Date: Sun, 8 Dec 2013 18:30:30 +0000 (+0100)
Subject: Merge branch 'commit_ts' into HEAD
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=bcc111df21e5a68d4f41381720e41d35ddff5994;p=users%2Fandresfreund%2Fpostgres.git

Merge branch 'commit_ts' into HEAD

* commit_ts:
  committs 0.4

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

bcc111df21e5a68d4f41381720e41d35ddff5994
diff --cc src/backend/access/transam/xlog.c
index 50c724aeeb,2470daa1bc..7a7d306df8
--- a/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/utils/misc/postgresql.conf.sample
index dfbb8e7b6e,ea06f2179b..5f3236c2b6
--- a/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 -