Merge branch 'serializable' of ssh://git.postgresql.org/users/kgrittn/postgres into...
authorKevin Grittner <Kevin.Grittner@wicourts.gov>
Wed, 24 Nov 2010 01:27:32 +0000 (19:27 -0600)
committerKevin Grittner <Kevin.Grittner@wicourts.gov>
Wed, 24 Nov 2010 01:27:32 +0000 (19:27 -0600)
commit70529a0ad1e787f57afadc5f8da37db7ba669681
tree803e2813d2b0bb6480052e025f1d022a3e070a84
parentc5ffaad567cae6b209a1304bca52483eb8ad8b63
parentf33704cfe1881b79f9b807fe1463265aa4e86ccb
Merge branch 'serializable' of ssh://git.postgresql.org/users/kgrittn/postgres into serializable

Conflicts:
src/backend/storage/lmgr/predicate.c
src/include/storage/predicate_internals.h
src/backend/storage/lmgr/predicate.c
src/include/storage/predicate_internals.h