Commit Graph

3923 Commits

Author SHA1 Message Date
Evan Borgstrom
1263b266b3 Only escape the database name, not the table
As per http://dev.mysql.com/doc/refman/5.1/en/grant.html you can only
specify wildcards in the database part of the specification for the
grant.

As it stands right now when the grant is generated it is for a table
with backticks in the name. This leads to the confusing situation where
the user can access the database but cannot access any tables.
2012-03-28 16:12:23 -04:00
Thomas S Hatch
e3fe0c05fc Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-28 12:08:13 -06:00
Thomas S Hatch
5b3b5bb145 Add sys module tests 2012-03-28 12:07:48 -06:00
Thomas S Hatch
7a835f25af Merge pull request #1017 from grierj/contribute
Ignoring check_minion in a master of master setup
2012-03-28 10:20:11 -07:00
Thomas S Hatch
86aecc1aea Merge pull request #1016 from codysoyland/issue-586
Ensure CWD is set when changing environments with "sudo - ".
2012-03-28 08:22:00 -07:00
Cody Soyland
aedc4859bb Ensure CWD is set when changing environments with "sudo - ". Closes GH-586. 2012-03-28 10:17:55 -05:00
Thomas S Hatch
e19e062217 Merge pull request #1015 from codysoyland/pip-improvements
Add user argument to pip state and module.
2012-03-28 08:15:19 -07:00
Cody Soyland
b2140e1c59 Add user argument to pip state and module. 2012-03-28 10:09:27 -05:00
Thomas S Hatch
7d005f9b50 clean up files before running tests 2012-03-28 00:10:13 -06:00
Thomas S Hatch
118c02886a Add tests for the data module 2012-03-27 23:45:49 -06:00
Thomas S Hatch
68b950e36d don't backtrace when asking for keys that are not present 2012-03-27 23:44:10 -06:00
Thomas S Hatch
27886f3e6a Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-27 23:01:56 -06:00
Thomas S Hatch
ee1d489e1b Add ability to clear out the minion datastore 2012-03-27 23:00:34 -06:00
Thomas S Hatch
0d774064ed Merge pull request #1011 from 0xDEC0DE/develop
make "salt-key --list" friendlier to scripts/pipes
2012-03-27 21:47:08 -07:00
Thomas S Hatch
d738525316 Don't load Exceptions into the function area
Don't worry, the imported functions are still available to the
functions, since they are reffed on the module level
2012-03-27 22:38:03 -06:00
Nicolas Simonds
aa01c58b57 make "salt-key --list" friendlier to scripts/pipes
This alters the behaviour of the --list flag to take arguments,
e.g., "pre", "accept", "rej", etc.  The default behaviour (--list-all)
is unmodified, although it is properly spelled "--list all" now.

This will allow administrators to see the subset of keys they care
about, and get key counts without getting awk involved (unless they
want to)
2012-03-27 21:37:00 -07:00
Thomas S Hatch
91219d4b88 handle no minions targeted case 2012-03-27 22:17:32 -06:00
Thomas S Hatch
dbb666a5ae fix oversight with non string args 2012-03-27 22:03:00 -06:00
Thomas S Hatch
bd5de3c81a fix issue with detect_kwargs and defaults 2012-03-27 21:56:08 -06:00
Thomas S Hatch
8ab6714acc Alter detect_kwargs to take the args list 2012-03-27 21:40:46 -06:00
Thomas S Hatch
edf705e727 Add more robust kwargs to the caller 2012-03-27 21:28:29 -06:00
Thomas S Hatch
2a777e0db5 beef up kwargs for remote ex and fix #1010 2012-03-27 21:23:48 -06:00
Thomas S Hatch
fcb41489ab s/hach/hash/ 2012-03-27 21:06:54 -06:00
Grier Johnson
e3fb7d76ff Ignoring check_minion in a master of master setup
This allows things other than globs to return values back to a master of
masters.  Otherwise the check_minion method sets empty minions and we
get no return back.  If we don't set the minion to something when
we bypass the empty minion check, then we get no return later on
due to the minion being empty.
2012-03-27 19:00:05 -07:00
Thomas S Hatch
8cf2a16ff9 Add tests for the cmd module 2012-03-27 17:05:38 -06:00
Thomas S Hatch
b19520edf7 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-27 15:20:23 -06:00
Thomas S Hatch
e06a7a00e4 Add a little something so people know that 0.9.9 is not out yet 2012-03-27 15:19:48 -06:00
Thomas S Hatch
1b77daac8f Initial commit for the 0.9.9 release document
I started this so that we can add things to the release nots as we
develop them, if you add a feature feel free to add it to the release
notes!
2012-03-27 15:18:01 -06:00
Thomas S Hatch
fa48b86f49 Merge pull request #1009 from trane/ssh-spaces
Allow more robust ssh key names in state.ssh_auth
2012-03-27 13:09:34 -07:00
Andrew Kuhnhausen
d0cf0344b2 Fix bug that slipped past commit
This was fixed in testing, didn't make it into last commit
2012-03-27 12:01:59 -06:00
Andrew Kuhnhausen
7cacb20f07 Fix irregularities in testing, update doc
Testing with all permutations, this works great.
2012-03-27 11:57:34 -06:00
Andrew Kuhnhausen
71cb79aa9f Add ability for ssh key name to include options, enc, comment
This adds the following possible names for ssh keys:
{options} {enc} {key} {comment}
{options} {enc} {key}
{enc} {key} {comment}
{enc} {key}
{key} {comment}
{key}
2012-03-27 11:27:37 -06:00
Jeff Schroeder
3a245aa077 Merge pull request #1007 from fatbox/fix-1e8e75d
Ensure the correct args are passed to jid_dir
2012-03-27 10:05:25 -07:00
Evan Borgstrom
b752066dd1 Ensure the correct args are passed to jid_dir 2012-03-27 12:53:38 -04:00
Thomas S Hatch
56210fbf10 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-26 23:18:07 -06:00
Thomas S Hatch
5cbc724ba5 Add disk tests 2012-03-26 23:13:36 -06:00
Thomas S Hatch
264e449e3d Merge pull request #1004 from UtahDave/fix_wol_example
Fix the CLI example
2012-03-26 20:48:33 -07:00
David Boucha
2a40427c62 Fix the CLI example 2012-03-26 19:26:42 -06:00
Thomas S Hatch
8714418920 Wrap chack in try/except block 2012-03-26 15:02:48 -06:00
Thomas S Hatch
ca35e4fe7d Fix #1002 2012-03-26 13:53:11 -06:00
Thomas S Hatch
b5255cff31 remove incorrect commas from the master config template, fix #1001 2012-03-25 09:48:11 -06:00
Thomas S Hatch
7c7e1e6159 Add daemonize_if to highstate and sls functions
This addition makes it so that you can now manage the salt minion
process cleanly with Salt, the result is that the process that the
remote call is running in detatches (daemonizes) the minion process that
is running. This only works if multiprocessing is set to true in the
minion config, which is the default
2012-03-24 23:58:17 -06:00
Thomas S Hatch
1c224dabc5 Add daemonize_if function for stock daemonize of module multiprocs 2012-03-24 23:57:29 -06:00
Thomas S Hatch
cc174936d0 Resolve grains by all lowercase strings, resolves #996 2012-03-24 23:19:26 -06:00
Thomas S Hatch
2b14b15dad Add note about python stack on RHEL5, Fix #999 2012-03-24 23:01:56 -06:00
Thomas S Hatch
ea01791a8d finish fixing jobs runner for new hash storage of jobs 2012-03-24 22:53:39 -06:00
Thomas S Hatch
96df9de51a Adress #1000 with check for bad passed data in confirm_top 2012-03-24 22:34:18 -06:00
Thomas S Hatch
d05a600d79 update jobs.active to support new hashed jobs 2012-03-24 22:20:16 -06:00
Thomas S Hatch
fd7b58b1af Add followlinks to os.walk for searching the file server
Fixes #985
2012-03-24 21:20:20 -06:00
Thomas S Hatch
6c25bb24a2 fix issue with syndic resolution of master 1p 2012-03-24 11:51:24 -06:00