[bucardo/el6/master: 5/5] Merge branch 'master' into el6

[Itamar Reis Peixoto]

commit 19ec8f6c6844c7e459d5655acce529bd3aa4fbcd
Merge: 6d8211f 5791b43
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Fri Apr 22 20:10:01 2011 -0300

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	bucardo.spec
    	master-master-replication-example.txt
    	sources

 .gitignore                            |    1 +
 bucardo.spec                          |   10 ++++++++--
 master-master-replication-example.txt |   18 ++++++++++++++++++
 sources                               |    2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)
---
diff --cc master-master-replication-example.txt
index 28b974a,ddb9bed..5e6d221
--- a/master-master-replication-example.txt
+++ b/master-master-replication-example.txt
@@@ -27,3 -27,19 +27,21 @@@ bucardo_ctl add sync replica source=alp
  
  
  echo "now run bucardo_ctl start as root and test the replication inserting / changing data in one.customers and two.customers"
++<<<<<<< HEAD
++=======
+ 
+ 
+ don't forget to setup cron job
+ 
+ http://bucardo.org/wiki/Bucardo/Cron
+ 
+ On each database that is used as a master (e.g. has a bucardo_delta table):
+ 
+  */15 * * * * psql -X -q -d masterhost -U bucardo -c "SELECT
+   bucardo_purge_delta('10 minutes'::interval)"
+ 
+ On the main Bucardo database:
+ 
+  */30 * * * * psql -X -q -d bucardo -U bucardo -c "SELECT
+   bucardo_purge_q_table('5 minutes'::interval)"
+