Permalink
Browse files

Merge branch 'master' of github.com:holland-backup/holland

  • Loading branch information...
abg committed Aug 9, 2010
2 parents 27d739b + 2909c87 commit 74d78abcdaa36c9beed3c29ea551c5816609d674
Showing with 6 additions and 4 deletions.
  1. +4 −2 config/backupsets/default.conf
  2. +1 −1 docs/source/conf.py
  3. +1 −1 docs/source/provider_configs/databasefiltering.rst
@@ -24,7 +24,9 @@ estimated-size-factor = 1.0
file-per-database = yes
#lock-method = auto-detect
#databases = "*"
+#exclude-databases = "foo", "bar"
#tables = "*"
+#exclude-tables = "foo.bar"
#stop-slave = no
#bin-log-position = no
@@ -36,5 +38,5 @@ file-per-database = yes
#inline = yes
#level = 1
-[mysql:client]
-defaults-file = /root/.my.cnf
+#[mysql:client]
+#defaults-extra-file = /root/.my.cnf
View
@@ -48,7 +48,7 @@
# The short X.Y version.
version = '1.0'
# The full version, including alpha/beta/rc tags.
-version = '1.0'
+release = '1.0.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -9,7 +9,7 @@ Database and Table filtering
**exclude-tables** = <glob>
-The above options accepts GLOBs and command separated lists. Multiple
+The above options accepts GLOBs in comma-separated lists. Multiple
filtering options can be specified. When filtering on tables, be sure to
include both the database and table name.

0 comments on commit 74d78ab

Please sign in to comment.