Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 11 Jul 2011 16:37:43 +0000 (12:37 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Mon, 11 Jul 2011 16:37:43 +0000 (12:37 -0400)
commitab1853d75628fa483328a4e54a82895d6ef93a19
tree8c8d5a955bdf48cc3de13d0325b1b1af903c39e4
parent30023c6980f09cba689ca3ae4bc694ba54be559d
parent8a69bb09cc0e5a51ba55977abdbb71861f9c0d98
Merge branch 'master' of ssh://git.postgresql.org/slony1-engine

Conflicts:
RELEASE
src/slon/remote_worker.c

- Clean up release notes a bit more

- Need MOVE_SET to lock both sl_config_lock /and/ sl_event_lock
src/slon/remote_worker.c