/rtmp/diff

text/x-diff

Download

Patch

Same data as JSON: GET /api/v1/attachments/:id/patch the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes. API reference →

Format: context

File	+	−
src/backend/access/transam/recovery.conf.sample	8	9

Index: src/backend/access/transam/recovery.conf.sample
===================================================================
RCS file: /cvsroot/pgsql/src/backend/access/transam/recovery.conf.sample,v
retrieving revision 1.7
diff -c -c -r1.7 recovery.conf.sample
*** src/backend/access/transam/recovery.conf.sample	29 Mar 2010 18:50:36 -0000	1.7
--- src/backend/access/transam/recovery.conf.sample	31 Mar 2010 14:16:12 -0000
***************
*** 20,27 ****
  # Comments are introduced with '#'.
  #
  # The complete list of option names and allowed values can be found
! # in the PostgreSQL documentation. The commented-out settings shown below
! # are example values.
  #
  #---------------------------------------------------------------------------
  # ARCHIVE RECOVERY PARAMETERS
--- 20,26 ----
  # Comments are introduced with '#'.
  #
  # The complete list of option names and allowed values can be found
! # in the PostgreSQL documentation.
  #
  #---------------------------------------------------------------------------
  # ARCHIVE RECOVERY PARAMETERS
***************
*** 44,50 ****
  # NOTE that the basename of %p will be different from %f; do not
  # expect them to be interchangeable.
  #
! #restore_command = 'cp /mnt/server/archivedir/%f %p'
  #
  #
  # restartpoint_command
--- 43,49 ----
  # NOTE that the basename of %p will be different from %f; do not
  # expect them to be interchangeable.
  #
! #restore_command = ''		# e.g. 'cp /mnt/server/archivedir/%f %p'
  #
  #
  # restartpoint_command
***************
*** 74,91 ****
  # transaction(s) with the recovery target value (ie, stop either
  # just after or just before the given target, respectively).
  #
! #recovery_target_time = '2004-07-14 22:39:00 EST'
  #
! #recovery_target_xid = '1100842'
  #
! #recovery_target_inclusive = 'true'		# 'true' or 'false'
  #
  #
  # If you want to recover into a timeline other than the "main line" shown in
  # pg_control, specify the timeline number here, or write 'latest' to get
  # the latest branch for which there's a history file.
  #
! #recovery_target_timeline = '33'		# number or 'latest'
  #
  #---------------------------------------------------------------------------
  # LOG-STREAMING REPLICATION PARAMETERS
--- 73,90 ----
  # transaction(s) with the recovery target value (ie, stop either
  # just after or just before the given target, respectively).
  #
! #recovery_target_time = ''	# e.g. '2004-07-14 22:39:00 EST'
  #
! #recovery_target_xid = ''
  #
! #recovery_target_inclusive = 'true'
  #
  #
  # If you want to recover into a timeline other than the "main line" shown in
  # pg_control, specify the timeline number here, or write 'latest' to get
  # the latest branch for which there's a history file.
  #
! #recovery_target_timeline = 'latest'
  #
  #---------------------------------------------------------------------------
  # LOG-STREAMING REPLICATION PARAMETERS
***************
*** 96,104 ****
  # connection settings primary_conninfo, and receives XLOG records
  # continuously.
  #
! #standby_mode = 'off'		# 'on' or 'off'
  #
! #primary_conninfo = 'host=localhost port=5432'
  #
  #
  # By default, a standby server keeps streaming XLOG records from the
--- 95,103 ----
  # connection settings primary_conninfo, and receives XLOG records
  # continuously.
  #
! #standby_mode = 'off'
  #
! #primary_conninfo = ''		# e.g. 'host=localhost port=5432'
  #
  #
  # By default, a standby server keeps streaming XLOG records from the