- Merge from upstream
Cron scripts needs a newline or they are ignored
Allow nagios to connect for nrpe checks
Fix typo p is password need P for port
Fix typo in setting backup_log
Allow the directory that backups are created in to be manually set
Fix typo in variable name
Expose backup dir and minor bug fixes
[gnuoy,r=mew] Expose the backup_dir via config.yaml + bug fixes
Don't use absolute path to call juju cmds - needed to allow /usr/local/bin/ overrides if e.g. using branched juju (until LP#1118945 is fixed )
[jjo] Don't use absolute path to call juju cmds - needed to allow /usr/local/bin/ overrides if e.g. using branched juju (until LP#1118945 is fixed)
- Merge from webops branch
- Merge from upstream, resolve conflicts
- Remove revision file
- Use parameters instead of string formatting for queries, to avoid issues with escaping.
- Quote identifiers.
- Generate username like in -joined if not set on relation by the time -changed gets called.
Handle "null" json output
  Sidnei da Silva 2013-04-24 - Quote identifiers.
  Sidnei da Silva 2013-04-23 - Use parameters instead of string formatting for queries, to avoid issues with escaping.
  Sidnei da Silva 2013-04-22 - Remove revision file
  Sidnei da Silva 2013-04-22 [merge] - Merge from upstream, resolve conflicts
  Sidnei da Silva 2013-04-22 [merge] - Merge from webops branch
  Haw Loeung (hloeung) 2013-02-27 [merge] [jjo] Don't use absolute path to call juju cmds - needed to allow /usr/local/bin/ overrides if e.g. using branched juju (until LP#1118945 is fixed)
  JuanJo Ciarlante 2013-02-26 Don't use absolute path to call juju cmds - needed to allow /usr/local/bin/ overrides if e.g. using branched juju (until LP#1118945 is fixed )
  Liam young 2013-02-05 [merge] [gnuoy,r=mew] Expose the backup_dir via config.yaml + bug fixes
  Liam young 2013-02-05 [merge] Expose backup dir and minor bug fixes
  Liam Young 2013-02-05 Fix typo in variable name
  Liam Young 2013-02-05 Allow the directory that backups are created in to be manually set
  Liam Young 2013-02-05 Fix typo in setting backup_log
  Liam Young 2013-02-05 Fix typo p is password need P for port
  Liam Young 2013-02-05 Allow nagios to connect for nrpe checks
  Liam Young 2013-02-05 Cron scripts needs a newline or they are ignored
  Sidnei da Silva 2013-01-30 [merge] - Merge from upstream
[andreas] always return a list, even if the json is 'null'