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: zsimic/salt
base: 4e09e21fc8
...
head fork: zsimic/salt
compare: 6f63bbc589
Commits on May 28, 2012
@akoumjian akoumjian Initial version of django state module. 1bc0cdb
@akoumjian akoumjian Merge branch 'develop' of git://github.com/saltstack/salt into develop d400c21
Commits on May 31, 2012
@akoumjian akoumjian more django state module functions 96e4eeb
@akoumjian akoumjian Merge branch 'develop' of git://github.com/saltstack/salt into develop 4bb63a0
Commits on Jun 13, 2012
@thatch45 thatch45 Don't trace if there is a filesystem race condition 2c911f5
@thatch45 thatch45 Only generate one pair of minion keys for the swarm c29d1d6
@thatch45 thatch45 Error in key verification throwing execption 7c340e9
@thatch45 thatch45 Key loading error in minion fix bae89e7
@thatch45 thatch45 Add job_cache config b0019fe
@thatch45 thatch45 Add functionality to cache_jobs option f86dcbf
@thatch45 thatch45 Caal it job_cache 5b9d16a
@thatch45 thatch45 Add config comments for job_cache 0370135
@akoumjian akoumjian Merge branch 'develop' of git://github.com/saltstack/salt into develop be7806e
@thatch45 thatch45 Add docs for job_cache 9737c36
Commits on Jun 14, 2012
@akoumjian akoumjian Added tutorial for preseeding minions with accepted keys. 39e4d8d
@akoumjian akoumjian Removing django state 0c4a700
@thatch45 thatch45 Merge pull request #1441 from akoumjian/develop
Add docs for preseeding minions with already accepted keys.
a3c1994
Commits on Jun 15, 2012
@thatch45 thatch45 Add highstate and sls last data files for last run on minion 10a19a0
@thatch45 thatch45 some syntax fixes in state data file management 39949b5
@elfixit elfixit if runas - force su to use given shell or DEFAULT_SHELL
this is done with cmd_prefix = "su -s " + shell in the if runas block.
4968e88
@thatch45 thatch45 Merge pull request #1444 from elfixit/develop
if runas - force su to use given shell or DEFAULT_SHELL
dbd7100
@thatch45 thatch45 update strings to use format ac0aff3
@elfixit elfixit FIX: if runas and with_env=False
makes shure there isn't any missing whitespaces..
ff9e562
@thatch45 thatch45 Merge pull request #1445 from elfixit/develop
FIX: if runas and with_env=False
3d5a082
@thatch45 thatch45 Initial draft of 0.10.0 release docs 34c4ed6
@thatch45 thatch45 Fix recursive check for the correct data 3a096ce
@mitsuhiko mitsuhiko Small networking fix 60367b3
@thatch45 thatch45 Add comment on tun workaround 53a6cf4
Commits on Jun 16, 2012
@vitaliyf vitaliyf Minor tweaks to documentation homepage. 863cb93
@thatch45 thatch45 fix kmod state virtual module check 2bed602
@vitaliyf vitaliyf Cleanup of state descriptions. ea8ff6b
@vitaliyf vitaliyf Merge branch 'docs-nitpics' into develop 43b95cf
@thatch45 thatch45 Merge pull request #1446 from vitaliyf/develop
Clean up of states/*.py docstring titles.
6f63bbc
Something went wrong with that request. Please try again.