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

@@ -1,4 +1,5 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define REPMGR_VERSION "2.1dev"
#endif