projects / slony1-engine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 627cc8d 5404627)
Merge branch 'bug306'
authorSteve Singer <ssinger@ca.afilias.info>
Fri, 26 Jul 2013 17:51:54 +0000 (13:51 -0400)
committerSteve Singer <ssinger@ca.afilias.info>
Fri, 26 Jul 2013 17:51:54 +0000 (13:51 -0400)
Conflicts:
doc/adminguide/slonyupgrade.sgml

1  2 
doc/adminguide/slonyupgrade.sgml patch | diff1 | diff2 | blob | history

diff --cc doc/adminguide/slonyupgrade.sgml
index ca8885b0f651bcb748fd95f194c8ac4ae0963836,47582b0be4e08ff1fb4cee28cb192d59c1ffb9db..65dd6ce11a2d5c8f025f4afc5e7f485ba59a29d2
--- 1/doc/adminguide/slonyupgrade.sgml
--- 2/doc/adminguide/slonyupgrade.sgml
+++ b/doc/adminguide/slonyupgrade.sgml
@@@ -125,7 -125,6 +125,8 @@@ have the &slony1; version number as par
  slony1_funcs.so is now slony1_funcs.2.2.0.so and slony1_funcs.sql is now
  slony1_funcs.2.2.0.sql 
  </para>
 +
++
  </sect2>
  
  
slony1: replication system with single master replicating to multiple subscribers supporting cascaded replication