summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-12-08 12:28:51 -0500
committerBrian Coca <bcoca@ansible.com>2015-12-08 12:28:51 -0500
commit9581e24a755c1d9b4f173236a1efc270b89f6b8e (patch)
tree2640198c6f0eb173c9ec8ba539ffe5c3baa5e385
parent15dcabe01231d43788c05152c80eaec41bcb6dad (diff)
parent5599bfb07da40e72bcc1a81503ca877d82243016 (diff)
downloadansible-modules-core-9581e24a755c1d9b4f173236a1efc270b89f6b8e.tar.gz
Merge pull request #2653 from marktheunissen/remove_marktheunissen
Remove Mark Theunissen as maintainer
-rw-r--r--database/mysql/mysql_db.py8
-rw-r--r--database/mysql/mysql_user.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/database/mysql/mysql_db.py b/database/mysql/mysql_db.py
index df70e0f7..5942fe2c 100644
--- a/database/mysql/mysql_db.py
+++ b/database/mysql/mysql_db.py
@@ -30,7 +30,7 @@ options:
name:
description:
- name of the database to add or remove
- - name=all May only be provided if I(state) is C(dump) or C(import).
+ - name=all May only be provided if I(state) is C(dump) or C(import).
- if name=all Works like --all-databases option for mysqldump (Added in 2.0)
required: true
default: null
@@ -90,7 +90,7 @@ notes:
the credentials from C(~/.my.cnf), and finally fall back to using the MySQL
default login of C(root) with no password.
requirements: [ ConfigParser ]
-author: "Mark Theunissen (@marktheunissen)"
+author: "Ansible Core Team"
'''
EXAMPLES = '''
@@ -367,7 +367,7 @@ def main():
except Exception, e:
module.fail_json(msg="error deleting database: " + str(e))
elif state == "dump":
- rc, stdout, stderr = db_dump(module, login_host, login_user,
+ rc, stdout, stderr = db_dump(module, login_host, login_user,
login_password, db, target, all_databases,
port=login_port,
socket=module.params['login_unix_socket'])
@@ -376,7 +376,7 @@ def main():
else:
module.exit_json(changed=True, db=db, msg=stdout)
elif state == "import":
- rc, stdout, stderr = db_import(module, login_host, login_user,
+ rc, stdout, stderr = db_import(module, login_host, login_user,
login_password, db, target, all_databases,
port=login_port,
socket=module.params['login_unix_socket'])
diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py
index 3ac7c089..3bc84d28 100644
--- a/database/mysql/mysql_user.py
+++ b/database/mysql/mysql_user.py
@@ -120,7 +120,7 @@ notes:
the file."
requirements: [ "MySQLdb" ]
-author: "Mark Theunissen (@marktheunissen)"
+author: "Ansible Core Team"
'''
EXAMPLES = """
@@ -139,7 +139,7 @@ EXAMPLES = """
# Specify grants composed of more than one word
- mysql_user: name=replication password=12345 priv=*.*:"REPLICATION CLIENT" state=present
-# Revoke all privileges for user 'bob' and password '12345'
+# Revoke all privileges for user 'bob' and password '12345'
- mysql_user: name=bob password=12345 priv=*.*:USAGE state=present
# Example privileges string format