git.postgresql.org Git - postgres-xl.git/commitdiff

projects / postgres-xl.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b69492 21d304d)

author	Pavan Deolasee <pavan.deolasee@gmail.com>
	Fri, 18 Aug 2017 05:43:32 +0000 (11:13 +0530)
committer	Pavan Deolasee <pavan.deolasee@gmail.com>
	Fri, 18 Aug 2017 05:43:32 +0000 (11:13 +0530)

This is the merge-base of PostgreSQL's master branch and REL_10_STABLE branch.
This should be the last merge from PG's master branch into XL 10 branch.
Subsequent merges must happen from REL_10_STABLE branch

122 files changed:

		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
contrib/pg_stat_statements/pg_stat_statements.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/bug.template	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/backup.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/catalogs.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/config.sgml	patch \|	diff1 \|