~bjornt/launchpad/architect-vision

« back to all changes in this revision

Viewing changes to lib/canonical/config/__init__.py

  • Committer: Bjorn Tillenius
  • Date: 2010-05-12 12:52:09 UTC
  • mfrom: (10599.1.251 launchpad)
  • Revision ID: bjorn@canonical.com-20100512125209-pip7jav1a7xq52d8
Merge RF.

Show diffs side-by-side

added added

removed removed

Lines of Context:
374
374
    _db_config_attrs = frozenset([
375
375
        'dbuser', 'auth_dbuser',
376
376
        'rw_main_master', 'rw_main_slave',
377
 
        'ro_main_master', 'ro_main_slave', 'auth_master', 'auth_slave',
 
377
        'ro_main_master', 'ro_main_slave',
378
378
        'db_statement_timeout', 'db_statement_timeout_precision',
379
379
        'isolation_level', 'randomise_select_results',
380
380
        'soft_request_timeout', 'storm_cache', 'storm_cache_size'])
381
381
    _db_config_required_attrs = frozenset([
382
382
        'dbuser', 'rw_main_master', 'rw_main_slave', 'ro_main_master',
383
 
        'ro_main_slave', 'auth_master', 'auth_slave'])
 
383
        'ro_main_slave'])
384
384
 
385
385
    @property
386
386
    def main_master(self):