Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: fxdgear/salt
base: 6c25bb24a2
...
head fork: fxdgear/salt
compare: d00133e343
Commits on Mar 25, 2012
@thatch45 thatch45 Add followlinks to os.walk for searching the file server
Fixes #985
fd7b58b
@thatch45 thatch45 update jobs.active to support new hashed jobs d05a600
@thatch45 thatch45 Adress #1000 with check for bad passed data in confirm_top 96df9de
@thatch45 thatch45 finish fixing jobs runner for new hash storage of jobs ea01791
@thatch45 thatch45 Add note about python stack on RHEL5, Fix #999 2b14b15
@thatch45 thatch45 Resolve grains by all lowercase strings, resolves #996 cc17493
@thatch45 thatch45 Add daemonize_if function for stock daemonize of module multiprocs 1c224da
@thatch45 thatch45 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
7c7e1e6
@thatch45 thatch45 remove incorrect commas from the master config template, fix #1001 b5255cf
Commits on Mar 26, 2012
@thatch45 thatch45 Fix #1002 ca35e4f
@thatch45 thatch45 Wrap chack in try/except block 8714418
Commits on Mar 27, 2012
@UtahDave UtahDave Fix the CLI example 2a40427
@thatch45 thatch45 Merge pull request #1004 from UtahDave/fix_wol_example
Fix the CLI example
264e449
@thatch45 thatch45 Add disk tests 5cbc724
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop 56210fb
@borgstrom borgstrom Ensure the correct args are passed to jid_dir b752066
@SEJeff SEJeff Merge pull request #1007 from fatbox/fix-1e8e75d
Ensure the correct args are passed to jid_dir
3a245aa
@trane trane 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}
71cb79a
@trane trane Fix irregularities in testing, update doc
Testing with all permutations, this works great.
7cacb20
@trane trane Fix bug that slipped past commit
This was fixed in testing, didn't make it into last commit
d0cf034
@thatch45 thatch45 Merge pull request #1009 from trane/ssh-spaces
Allow more robust ssh key names in state.ssh_auth
fa48b86
@thatch45 thatch45 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!
1b77daa
@thatch45 thatch45 Add a little something so people know that 0.9.9 is not out yet e06a7a0
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop b19520e
@thatch45 thatch45 Add tests for the cmd module 8cf2a16
Commits on Mar 28, 2012
@grierj grierj 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.
e3fb7d7
@thatch45 thatch45 s/hach/hash/ fcb4148
@thatch45 thatch45 beef up kwargs for remote ex and fix #1010 2a777e0
@thatch45 thatch45 Add more robust kwargs to the caller edf705e
@thatch45 thatch45 Alter detect_kwargs to take the args list 8ab6714
@thatch45 thatch45 fix issue with detect_kwargs and defaults bd5de3c
@thatch45 thatch45 fix oversight with non string args dbb666a
@thatch45 thatch45 handle no minions targeted case 91219d4
Nicolas Simonds 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)
aa01c58
@thatch45 thatch45 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
d738525
@thatch45 thatch45 Merge pull request #1011 from 0xDEC0DE/develop
make "salt-key --list" friendlier to scripts/pipes
0d77406
@thatch45 thatch45 Add ability to clear out the minion datastore ee1d489
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop 27886f3
@thatch45 thatch45 don't backtrace when asking for keys that are not present 68b950e
@thatch45 thatch45 Add tests for the data module 118c028
@thatch45 thatch45 clean up files before running tests 7d005f9
Cody Soyland Add user argument to pip state and module. b2140e1
@thatch45 thatch45 Merge pull request #1015 from codysoyland/pip-improvements
Add user argument to pip state and module.
e19e062
Cody Soyland Ensure CWD is set when changing environments with "sudo - ". Closes G… aedc485
@thatch45 thatch45 Merge pull request #1016 from codysoyland/issue-586
Ensure CWD is set when changing environments with "sudo - ".
86aecc1
@thatch45 thatch45 Merge pull request #1017 from grierj/contribute
Ignoring check_minion in a master of master setup
7a835f2
@thatch45 thatch45 Add sys module tests 5b3b5bb
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop e3fe0c0
@borgstrom borgstrom 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.
1263b26
@thatch45 thatch45 Merge pull request #1019 from fatbox/mysql-grant-fix
Only escape the database name, not the table
af18d2d
@thatch45 thatch45 fix string standards and use yaml.safe_load 12a0f44
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop d47ae03
Commits on Mar 29, 2012
@thatch45 thatch45 fix break in publish caused by hashed jid dirs f37725f
@thatch45 thatch45 this is causing an exception, changing back until it can be hunted down bc9441c
@thatch45 thatch45 update config for publish tests ecfb4b1
@thatch45 thatch45 publish tests 62b709d
@thatch45 thatch45 Add auth test for minion publish 7221d56
@thatch45 thatch45 Add syndic master config for the test environment 1e63ffc
@thatch45 thatch45 Update tests to run an extra master and a syndic f06ea93
@thatch45 thatch45 Add a SyndicCase for testing syndic functions 9d0f49e
@thatch45 thatch45 add initial files for syndic tests fac809f
@thatch45 thatch45 update configs for syndic tests cda5dfb
@thatch45 thatch45 Add a syndic, syndic master and finish synndic tests 53befac
@thatch45 thatch45 Add docs for refresh_pillar, Fix #1020 bb356df
@thatch45 thatch45 remove misconfigured file_roots lines d643db9
Stephan Scheller There is no /proc/modules on OS X, fixed kvm_hyper module from crashing 30af318
Stephan Scheller Per SEJeff's comment, disabled kvm_hyper module for OS X correctly ec9889b
@SEJeff SEJeff Merge pull request #1023 from stephas/develop
OS X and kvm module disable
ff21718
@thatch45 thatch45 remove old master process fix d1dee6d
@thatch45 thatch45 Merge branch 'develop' of github.com:saltstack/salt into develop 9cedfe7
@thatch45 thatch45 Add pillar data to tests 6dadf88
@thatch45 thatch45 Add pillar module verification 47768c7
@thatch45 thatch45 Add file_roots config to tests 2d81528
@thatch45 thatch45 Add files to file_roots for tests 24bc642
@thatch45 thatch45 Add some tests for states d00133e
Something went wrong with that request. Please try again.