git.postgresql.org Git - 2ndquadrant_bdr.git/commit

projects / 2ndquadrant_bdr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 20ee102 a1efb79)

author	Petr Jelinek <pjmodos@pjmodos.net>
	Thu, 17 Mar 2016 07:02:31 +0000 (08:02 +0100)
committer	Petr Jelinek <pjmodos@pjmodos.net>
	Thu, 17 Mar 2016 07:02:31 +0000 (08:02 +0100)
commit	8c26d95ee502211d9439fea5301effdb92671c04
tree	bf0f57093d77c90640188dd728eb93b271b71469	tree
parent	20ee102b3425fd750e7e47e7474d12ce6eae5bfd	commit \| diff
parent	a1efb790fb99e989e5cd3ff5ae8cc6df3e250516	commit \| diff

Merge tag 'REL9_4_6' into bdr-pg/REL9_4_STABLE

Conflicts:
src/backend/commands/tablecmds.c
src/backend/replication/walsender.c

14 files changed:

contrib/pg_upgrade/pg_upgrade.c	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/func.sgml	diff1 \|	diff2 \|	blob \| history
src/backend/commands/tablecmds.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/typecmds.c	diff1 \|	diff2 \|	blob \| history
src/backend/postmaster/bgworker.c	diff1 \|	diff2 \|	blob \| history
src/backend/replication/logical/logicalfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/replication/walsender.c	diff1 \|	diff2 \|	blob \| history
src/backend/utils/adt/ruleutils.c	diff1 \|	diff2 \|	blob \| history
src/backend/utils/misc/guc.c	diff1 \|	diff2 \|	blob \| history
src/bin/initdb/initdb.c	diff1 \|	diff2 \|	blob \| history
src/bin/pg_dump/pg_dump.c	diff1 \|	diff2 \|	blob \| history
src/bin/psql/describe.c	diff1 \|	diff2 \|	blob \| history
src/include/catalog/pg_proc.h	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/updatable_views.out	diff1 \|	diff2 \|	blob \| history

Obsolete repo for Bi-directional replication for PostgreSQL. See https://github.com/2ndQuadrant/bdr/