Merge branch 'master' of ssh://git.postgresql.org/slony1-engine
authorChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 30 Aug 2013 19:07:00 +0000 (15:07 -0400)
committerChristopher Browne <cbbrowne@ca.afilias.info>
Fri, 30 Aug 2013 19:07:00 +0000 (15:07 -0400)
Conflicts:
RELEASE
doc/adminguide/ddlchanges.sgml

1  2 
RELEASE

diff --cc RELEASE
index d027f6edd60fd7d23692ce650ff1a273ac94f475,adb7c4c9096010189c5d8c91222ad040393093eb..63b3422a05353b2862bde3c258a70bcd50072c98
+++ b/RELEASE
@@@ -7,9 -7,10 +7,11 @@@
  - Bug 304 :: Record sequence values each time SQL is recorded in
               ~sl_log_script~, and set those values before invoking the
               SQL on the replica.
+ - Bug 309 :: create sl_failover_targets when upgrading 2.1.x to 2.2.0
+ - Bug 310 :: Fixing issue where the FAILOVER command can put slon in a restart loop
 +
  *** 2.2.0 b5
  
  - Bug 296 :: Fixes for FAILOVER when non-origin nodes fail at the same time