Squashed commit of the following:

commit 9f4fcf093adb6178b19f6bb83db9b7ed65dd6df0
Merge: f3e0776 40560a4
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Fri Jul 8 14:53:21 2011 -0400

    Merge branch 'master' of git://git.postgresql.org/git/slony1-engine into bug218

    Conflicts:
    	RELEASE
    	src/slon/remote_worker.c

commit 40560a4515b3febfdd368cca89ad4c3c73456ae2
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Fri Jul 8 14:02:28 2011 -0400

    Lock sl_event_lock before processing the MOVE_SET
    because the ACCEPT_SET event will be generated.

commit c7fcd8e1a61b64b1ee4776c00140a5fd5c35a4f0
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Fri Jul 8 12:00:28 2011 -0400

    Documentation updates:
    -Updating release notes
    -Regenerated complexenv.png from the dia file since
     it did not seem to match
    (cherry picked from commit 194e8fb65e9876e5f2dff477c56a0f66856ac583)

    Conflicts:

    	RELEASE

commit f50cefb2f79dbce4817e155b71355a193ab9d930
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Fri Jul 8 10:47:50 2011 -0400

    Remove call to backend function get_share_path()
    This is a backend function slonik should not be calling.
    PGSHARE is defined by configure we count on it being set.
    (cherry picked from commit 16304e08870b07e12cad19ee430e39afafc74a67)

commit 37c65039ece4ed77c85396683cce6bdd768f3c3e
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Fri Jul 8 10:48:54 2011 -0400

    Per Bug #36, -lpgport is only germaine to win/win32 platforms
    (cherry picked from commit 6f59f0a6f1ff513a343c3edac0331ba70971335a)

    Conflicts:

    	src/slonik/Makefile

commit 973d12f30464ea39fd3fa6cbeaf3a6f96184b757
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Thu Jul 7 11:21:39 2011 -0400

    Updating release notes

commit b9ef590e56fab3fa6f3d06192a3ea73650036284
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Tue Jun 21 09:52:15 2011 -0400

    Fix for bug 222.
    The cleanupThread can block new sessions from finishing the logTrigger.
    If the cleanupThread has to wait/block to get an exclusive lock
    during the truncate on sl_log_1 or sl_log_2 (and this can happen dispite
    NOWAIT in logswitch_finish) then any new sessions will block
    waiting to obtain a row lock while preparing the plans for
    sl_log_1 and/or sl_log_2.  The problem is that the plans
    are prepared for both sl_log_1 and sl_log_2 irrespective
    of what sl_log_status is.

    This patch will have the log trigger only prepare
    the plan based on the current setting of sl_log_status
    so the log trigger won't try to prepare a plan against
    a log table that is being truncated.

commit dc61270672c3fbb2c49e8b0b1894b7bf72b02d6d
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Mon Jul 4 13:25:41 2011 -0400

    Fix for bug 223.
    Have slonik clear out the last saved event id
    for a node that it just uninstalled.

commit f072e74a2c871cabb907f8201d19446c2039b19d
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Thu Jul 7 11:18:30 2011 -0400

    Updating release notes

commit aab898de15ac5f135b2f6ece105d82a0bcfed023
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Thu Jun 9 17:02:21 2011 -0400

    Fix for bug 216.
    Pass the time to postgresql as seconds from EPOCH instead of as a timestamp
    with a timezone.  MS-Windows does not generate the timezone as a 3 letter
    abbreviation but as a full word.  This patch avoids the problem.

commit ba62f58434c51a6255c81c903d4af522a587c4e5
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Wed Jul 6 16:36:02 2011 -0400

    Fix autoconf warning about datarootdir
    Patch from Peter Eisentraut

    Conflicts:

    	RELEASE

commit 51d11b9bfb81d6c64720fec3dc361749e407d9d3
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Wed Jul 6 16:30:41 2011 -0400

    Fixing various compiler warnings.
    (cherry picked from commit e1573932e33453358cfc242199b7a0af03130c57)

    Conflicts:

    	src/slonik/slonik.c

commit f3e0776f33c345227df64f06275679ed15bf1a83
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Wed Jul 6 11:48:57 2011 -0400

    Bug #218

    Enclose cleanup call + locks with BEGIN/COMMIT in the cleanup thread.

    Also, ran pg_indent to clean up the code.

commit d46768735d826807f3ab3e71c01975c4f05d20c2
Merge: 35fbb13 f52cb86
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Wed Jul 6 11:43:07 2011 -0400

    Merge branch 'master' of git://git.postgresql.org/git/slony1-engine into bug218

    Conflicts:
    	RELEASE

commit 35fbb13b44e2136b808a5cd7e8457f616fcc5ccb
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Fri Jun 10 16:18:37 2011 -0400

    Bug #218

    - As in bug #196, slon/slonik need to acquire locks on sl_config_lock
      as a first action, to avoid race condition

    - Remove lock requests for sl_config_lock from stored functions

commit 9bd169a5f872ddef48d73168e66970c53b39110d
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Fri Jun 10 12:37:43 2011 -0400

    Bug #218 - add in explicit locks at start of transaction of sl_config_lock.

    In numerous cases, this combines into the same statement that locks sl_event_lock.

commit 57f38641536c9870d7626f8fbf16bd38f4ebd46d
Merge: 3da023c 46faa6b
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Fri Jun 10 11:32:42 2011 -0400

    Merge branch 'master' of git://git.postgresql.org/git/slony1-engine

commit 3da023ccb1cf7b8eb0a24982830be9f2faf2efd5
Merge: 13da3da 4fec715
Author: Christopher Browne <cbbrowne at ca.afilias.info>
Date:   Wed Jun 8 17:16:15 2011 -0400

    Merge branch 'master' of git://git.postgresql.org/git/slony1-engine

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=slony1-engine.git;a=commitdiff;h=30023c6980f09cba689ca3ae4bc694ba54be559d

Modified Files
--------------
Makefile.global.in            |    1 +
RELEASE                       |   35 +++++-
doc/adminguide/complexenv.png |  Bin 27382 -> 25121 bytes
src/backend/slony1_funcs.c    |  117 +++++++++++---------
src/backend/slony1_funcs.sql  |  256 +----------------------------------------
src/misc/avl_tree.c           |    3 +-
src/slon/cleanup_thread.c     |   33 ++++--
src/slon/local_listen.c       |    4 -
src/slon/monitor_thread.c     |    3 +-
src/slon/remote_worker.c      |   84 ++++++++++---
src/slonik/Makefile           |    4 +-
src/slonik/slonik.c           |  170 +++++++++++++++++----------
12 files changed, 295 insertions(+), 415 deletions(-)