Merge branch 'REL2_0_STABLE'

Conflicts:
	HISTORY
	dbutils.h
	repmgr.c
	repmgrd.c
	version.h
This commit is contained in:
Christian Kruse
2014-01-10 16:07:33 +01:00
18 changed files with 670 additions and 273 deletions

View File

@@ -32,6 +32,9 @@ bool is_pgup(PGconn *conn, int timeout);
char *pg_version(PGconn *conn, char* major_version);
bool guc_setted(PGconn *conn, const char *parameter, const char *op,
const char *value);
bool guc_setted_typed(PGconn *conn, const char *parameter, const char *op,
const char *value, const char *datatype);
const char *get_cluster_size(PGconn *conn);
PGconn *getMasterConnection(PGconn *standby_conn, char *schema, char *cluster,
int *master_id, char *master_conninfo_out);