Merge branch 'PGPROEE9_6_aqo' of https://git.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_aqo

Oleg Ivanov · Oleg Ivanov · commit 1e765ffe51ec · 2017-09-26T12:02:16.000+03:00
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
@@ -267,7 +267,7 @@ stop_postmaster(void)
 		fflush(stderr);
 
 		snprintf(buf, sizeof(buf),
-				 "\"%s%spg_ctl\" stop -D \"%s/data\" -s -m fast",
+				 "\"%s%spg_ctl\" stop -D \"%s/data\" -s -m fast -t 600",
 				 bindir ? bindir : "",
 				 bindir ? "/" : "",
 				 temp_instance);
