From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 19 Sep 2015 02:40:10 +0000 (-0400)
Subject: Add missing serial comma
X-Git-Tag: REL9_6_BETA1~1341
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a1e15e4a911502bbfb2f36a18e6b930b6caf85d;p=thirdparty%2Fpostgresql.git

Add missing serial comma
---

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index a092aad2d30..a87f09ee47f 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4978,7 +4978,7 @@ readRecoveryCommandFile(void)
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 						 errmsg("invalid value for recovery parameter \"%s\"",
 								"recovery_target_action"),
-						 errhint("The allowed values are \"pause\", \"promote\" and \"shutdown\".")));
+						 errhint("The allowed values are \"pause\", \"promote\", and \"shutdown\".")));
 
 			ereport(DEBUG2,
 					(errmsg_internal("recovery_target_action = '%s'",