• Antoine Catton's avatar
    Merging work from lamp-failover branch : · df41f7f5
    Antoine Catton authored
     * Cleaning up and fixing mysql recipe
     * Adding backup on mariadb recipe (in a different software type)
     * Adding backup recovering on mariadb
     * Removing generic recipes
    
    Squashed commit of the following:
    
    commit 7daea6f475669461095c9cfcd3ceb468663108b0
    Merge: 23ec754 16e97301
    Author: Antoine Catton <acatton@tiolive.com>
    Date:   Tue Sep 27 16:30:40 2011 +0200
    
        Merge branch 'master' into lamp-failover
    
        Conflicts:
        	slapos/recipe/mysql/__init__.py
        	software/mariadb/instance.cfg
        	software/mariadb/software.cfg
    
    commit 23ec754142936b2ba6ebfc41e7d6be4169f115a2
    Author: Antoine Catton <acatton@tiolive.com>
    Date:   Tue Sep 27 16:28:41 2011 +0200
    
        Remove inexistant import script from mariadb instance.cfg
    
    commit 29c03b04f0c220258e834bafc9d8174340abc948
    Author: Antoine Catton <acatton@tiolive.com>
    Date:   Tue Sep 27 16:24:57 2011 +0200
    
        Remove useless generic recipes
    
    commit f6fa78b55f787f530bb335b91936a20470510877
    Author: Antoine Catton <acatton@t...
    df41f7f5
buildout.cfg 2.11 KB