Commit1905111

committed

Merge branch 'rel1_1_migration' into rel_1_1_beta

2 parents130463a +9226acb commit1905111Copy full SHA for 1905111

File tree

+4393

-6

lines changed

+4393

-6

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@ OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o \`
`8`	`8`	`src/pg_compat.o$(WIN32RES)`
`9`	`9`
`10`	`10`	`EXTENSION = pg_pathman`
`11`		`-EXTVERSION = 1.0`
`12`		`-DATA_built =$(EXTENSION)--$(EXTVERSION).sql`
	`11`	`+EXTVERSION = 1.1`
	`12`	`+DATA_built = pg_pathman--$(EXTVERSION).sql`
	`13`	`+DATA = pg_pathman--1.0.sql pg_pathman--1.0--1.1.sql`
`13`	`14`	`PGFILEDESC = "pg_pathman - partitioning tool"`
`14`	`15`
`15`	`16`	`REGRESS = pathman_basic\`
`@@ -20,7 +21,7 @@ REGRESS = pathman_basic \`
`20`	`21`	`pathman_permissions\`
`21`	`22`	`pathman_rowmarks`
`22`	`23`	`EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add`
`23`		`-EXTRA_CLEAN =$(EXTENSION)--$(EXTVERSION).sql ./isolation_output`
	`24`	`+EXTRA_CLEAN =pg_pathman--$(EXTVERSION).sql ./isolation_output`
`24`	`25`
`25`	`26`	`ifdefUSE_PGXS`
`26`	`27`	`PG_CONFIG = pg_config`

Comments

(0)