Commit graph

6077 commits

Author SHA1 Message Date
Michael DeHaan
d5d81813a6 Merge pull request #3634 from stintel/mysql-revoke-grant-option
Only revoke GRANT OPTION when user actually has it
2013-08-01 17:04:54 -07:00
Michael DeHaan
8cc13590b4 Make exceptions handling python 2.4 compatible. 2013-07-29 13:27:16 -04:00
Michael DeHaan
6854857533 update CHANGELOG 2013-07-29 13:26:33 -04:00
Michael DeHaan
ed55ac1a15 Merge pull request #3666 from bpennypacker/statdoc
doc update for stat module
2013-07-28 06:23:14 -07:00
Michael DeHaan
eceaa551d6 correct misnamed variable in changelog. 2013-07-28 09:15:08 -04:00
Michael DeHaan
ec25147fc1 Merge pull request #3629 from ralph-tice/fix-3626
fixed vpc provisioning / clarified group_id usage
2013-07-28 06:14:56 -07:00
Bruce Pennypacker
0bbbefeb3f doc update 2013-07-25 09:59:23 -04:00
Stijn Tintel
9d0fc0fd67 Only revoke GRANT OPTION when user actually has it
When revoking privileges from a user, the GRANT OPTION is always
revoked, even if the user doesn't have it. If the user exists, this
doesn't give an error, but if the user doesn't exist, it does:

mysql> GRANT ALL ON test.* TO 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE ALL ON test.* FROM 'test'@'localhost';
Query OK, 0 rows affected (0.00 sec)

mysql> REVOKE GRANT OPTION ON test.* FROM 'test'@'localhost';
ERROR 1141 (42000): There is no such grant defined for user 'test' on
host 'localhost'

Additionally, in MySQL 5.6 this breaks replication because of
http://bugs.mysql.com/bug.php?id=68892.

Rather than revoking the GRANT OPTION and catching the error, check if
the user actually has it and only revoke it when he does.
2013-07-23 13:00:29 +02:00
Michael DeHaan
d1effecb2e Merge pull request #3628 from jlund/yaml-syntax
Minor cleanup of YAML Syntax documentation
2013-07-22 15:20:53 -07:00
Joshua Lund
be6feee058 Minor cleanup of YAML Syntax documentation 2013-07-22 16:09:18 -06:00
Ralph Tice
1529a974e1 fixed vpc provisioning / clarified group_id usage 2013-07-22 17:00:13 -05:00
Michael DeHaan
86f05f11e7 Merge branch 'devel' of github.com:ansible/ansible into devel 2013-07-22 15:16:47 -04:00
Michael DeHaan
a35370a766 Fix prev feature commit, Do not require aptitude to use apt commands in the apt module, only needed when upgrading. 2013-07-22 15:15:55 -04:00
Michael DeHaan
fc9aa5f014 Continue on mount errors, don't fail the setup module. 2013-07-22 13:57:35 -04:00
Michael DeHaan
f0eafff1b4 Merge pull request #3621 from sergevanginderachter/rename2flattened
also rename plugin name in error message
2013-07-22 10:32:38 -07:00
Michael DeHaan
9c9bc09ce6 Merge pull request #3622 from bcoca/fix_the_stat_fix
use global to fail as its not in self
2013-07-22 07:56:49 -07:00
Brian Coca
3f85a82ae9 use global to fail as its not in self
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-22 10:54:20 -04:00
Serge van Ginderachter
b40295910d also rename plugin name in error message 2013-07-22 16:47:36 +02:00
Michael DeHaan
2fe25f19dc Fix to group_by module as a result of previous conditional upgrades. 2013-07-22 10:11:19 -04:00
Michael DeHaan
e3f213e030 Fixup error reporting. 2013-07-22 08:35:31 -04:00
Michael DeHaan
c07dd07767 Add raw copy support (raw=yes), tweak tempfile error message string. 2013-07-22 08:25:55 -04:00
Michael DeHaan
2e38d92262 Merge pull request #3619 from ches/doc-fixes
Enhance meta-docs on... contributing to docs.
2013-07-22 04:43:50 -07:00
Michael DeHaan
5e02759570 Merge pull request #3617 from dermute/devel
svr4pkg doesn't work on Sol10
2013-07-22 04:37:10 -07:00
Ches Martin
b35fc42d36 Enhance meta-docs on... contributing to docs.
- Update FAQ entry to refer to docsite README and reduce redundancy.

- Add additional info to docsite README: Sphinx building, link to module
  documentation reference.
2013-07-22 17:20:38 +07:00
Michael DeHaan
a7a82c79c0 Merge pull request #3611 from tgerla/docsfix
very minor fix to playbooks2 to fix a formatting error
2013-07-21 12:47:03 -07:00
Tim Gerla
7e07bca6bf very minor fix to playbooks2 to fix a formatting error 2013-07-21 11:50:12 -07:00
Michael DeHaan
524c7bd791 Remove end of line semicolons. 2013-07-21 11:55:38 -04:00
Michael DeHaan
19d78d6e18 Remove reference to 'context' since it's not implemented. 2013-07-21 11:52:22 -04:00
Michael DeHaan
0cf5e5cec3 Merge branch 'devel' of git://github.com/bradleyy/ansible into together 2013-07-21 11:47:05 -04:00
Michael DeHaan
c5cbb1dc62 Fix route53 module docs version/module name 2013-07-21 11:20:37 -04:00
Michael DeHaan
77a4dcca85 Sphinx/docs syntax fixes 2013-07-21 11:18:07 -04:00
Michael DeHaan
10f99938b9 Fix YAML doc errors. 2013-07-21 11:15:06 -04:00
Michael DeHaan
af94fb8eea Update changelog 2013-07-21 11:12:30 -04:00
Michael DeHaan
7961a81b3f Update docs to add version_added attribute. 2013-07-21 11:12:04 -04:00
Michael DeHaan
32b3c59bad Merge pull request #3400 from diko4096/patch-1
Update gem
2013-07-21 08:10:27 -07:00
Michael DeHaan
fc70fbcab0 update changelog 2013-07-21 10:54:57 -04:00
Michael DeHaan
5fe1f03885 Merge pull request #3413 from evan82/devel
Added module for baking EC2 AMIs
2013-07-21 07:53:54 -07:00
Michael DeHaan
e2af927c3f Take notes on features that need to be documented in CHANGELOG 2013-07-21 10:49:08 -04:00
Michael DeHaan
feb4a8847d Slight edit to when_changed docs 2013-07-21 10:48:22 -04:00
Michael DeHaan
b603bb0f73 Merge branch 'changed_when-doc' of git://github.com/stoned/ansible into devel 2013-07-21 10:41:35 -04:00
Michael DeHaan
8be17cd7f8 Add note about changed_when to changelog. 2013-07-21 10:39:00 -04:00
Michael DeHaan
f3c69040b4 Merge branch 'changed_when' into devel 2013-07-21 10:37:56 -04:00
Michael DeHaan
0756aa406a Change conditional operation workflow.
Conflicts:

	lib/ansible/utils/__init__.py
2013-07-21 10:37:02 -04:00
Michael DeHaan
7f462a346a Work in progress on merging changed_when. 2013-07-21 10:34:47 -04:00
Michael DeHaan
3f1f0e7bc2 Change conditional operation workflow. 2013-07-21 10:33:49 -04:00
Michael DeHaan
88720516a1 Merge branch 'changed_when' of git://github.com/stoned/ansible into changed_when 2013-07-21 10:14:03 -04:00
Michael DeHaan
1acd9b6325 Update CHANGELOG 2013-07-21 10:12:28 -04:00
Michael DeHaan
e589365279 Merge branch 'iss_cron' of git://github.com/dirtyharrycallahan/ansible into dh_cron 2013-07-21 10:00:11 -04:00
Michael DeHaan
ad086cdd1d Update changelog 2013-07-21 09:55:12 -04:00
Michael DeHaan
44f55d72b6 Merge pull request #3574 from bpennypacker/route53
AWS route53 module
2013-07-21 06:54:14 -07:00