Merge branch 'PGPROEE10_DEV' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE10_DEV

Author: vbwagner

src/include/pg_config.h.win32

@@ -565,20 +565,18 @@
 /* PostgreSQL version as a number */
 #define PG_VERSION_NUM 100001
 
-#define PGPRO_EDITION "standard"
+#define PGPRO_EDITION "enterprise"
 
-#define PGPRO_VERSION "10beta1.1"
+#define PGPRO_VERSION "10.1.1"
 
 #define PGPRO_EE
 
 #define XID_IS_64BIT
 
-#define PGPRO_PACKAGE_STR "PostgresPro 10beta1.1"
+#define PGPRO_PACKAGE_STR "PostgresPro 10.1.1"
 
 #define PGPRO_PACKAGE_NAME "PostgresPro"
 
-#define PGPRO_PACKAGE_STR "PostgresPro 9.6.1.1"
-
 /* Define to the one symbol short name of this package. */
 
 #define PACKAGE_TARNAME "postgresql"