valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,011 Commits 24 Branches 182 Tags 341 MiB
e26ff89956
Commit Graph

45011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
e26ff89956 Some major hacking of the loader, don't really like it... but i guess i'll keep it around for a while 
Conflicts:
	salt/loader.py
 2015-02-07 11:50:57 -08:00
Seth House
9a1a2db3aa Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-06 19:52:23 -07:00
Pedro Algarvio
5586c2064b Merge pull request #20487 from whiteinge/doc-remove-mako-mock 
Remove Mako from mocked deps for docs build
 2015-02-07 02:28:53 +00:00
Seth House
bf6dfe823e Remove Mako from mocked deps for docs build 
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.

Closes #9571 (at long last).
 2015-02-06 19:00:35 -07:00
jfindlay
f57c15f672 Merge pull request #20480 from basepi/saltssh.errors.20223 
[2014.7] Fix bugs in salt-ssh cleanup code from #20229
 2015-02-06 16:10:46 -07:00
Colton Myers
7fc92c8dce Merge pull request #20483 from basepi/fixcronmergeforward 
Fix an error caused by a bad merge forward
 2015-02-06 15:43:27 -07:00
Colton Myers
307212c0e0 Fix an error caused by a bad merge forward 2015-02-06 15:42:55 -07:00
Colton Myers
024938341e Fix pylint 2015-02-06 15:25:15 -07:00
Colton Myers
1370fddfef Yield ret immediately 2015-02-06 15:03:54 -07:00
Colton Myers
48c029efdb Fix race condition in salt-ssh cleanup 
Conflicts:
	salt/client/ssh/__init__.py
 2015-02-06 15:03:39 -07:00
jfindlay
3872ffb9ef Merge pull request #20479 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-06 14:04:03 -07:00
Colton Myers
6e7df06e05 Remove code as instructed by @jfindlay 2015-02-06 13:13:30 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
 2015-02-06 13:00:14 -07:00
Thomas S Hatch
94b1316811 Merge pull request #20462 from thatch45/schedule_track 
Add minute granular start time
 2015-02-06 10:36:15 -07:00
Thomas S Hatch
15b1a459ba Merge pull request #20445 from whiteinge/doc-preseed-key-links 
Add cross-refs to other ways to preseed minion keys
 2015-02-06 10:34:37 -07:00
Thomas S Hatch
b40bfae919 Merge pull request #20440 from techhat/pageropts 
Ensure that creds is a dict (pagerduty)
 2015-02-06 10:31:21 -07:00
Thomas S Hatch
91e2b6db93 Merge pull request #20424 from techhat/thinrequests 
Remove requests from the thin tarball
 2015-02-06 10:30:47 -07:00
Mike Place
c96b4725ae Merge pull request #20465 from cachedout/safemode_config 
Fix mismatched config value for auth_safemode
 2015-02-06 08:51:40 -07:00
Mike Place
f9cb6cdeeb Fix mismatched config value for auth_safemode 
The actual default is false.

Closes #19945
 2015-02-06 09:19:10 -07:00
Nicole Thomas
193a8138fd Merge pull request #20460 from rallytime/pylint_15_PR_cleanup 
Clean up some pylint on 2015.2
 2015-02-06 08:46:15 -07:00
Thomas S Hatch
9b70bfcf66 use utc time 2015-02-06 08:27:57 -07:00
Thomas S Hatch
f335d92d04 Add minute granular start time 2015-02-06 08:23:46 -07:00
rallytime
db612d0b81 Clean up some pylint on 2015.2 
This way PRs against 2015.2 will be a little happier
 2015-02-06 07:58:26 -07:00
Nicole Thomas
2aec7ddd24 Merge pull request #20434 from rallytime/bp-20427 
Backport #20427 to 2015.2
 2015-02-06 07:53:25 -07:00
Nicole Thomas
debb844cca Merge pull request #20433 from rallytime/bp-20386 
Backport #20386 to 2014.7
 2015-02-06 07:52:23 -07:00
Mike Place
33cfeb6b01 Merge pull request #20448 from whiteinge/doc-sse-tag-field 
Clarify and update SSE example docs
 2015-02-05 20:40:14 -07:00
C. R. Oldham
a0ab98d1ab Merge pull request #20437 from cro/linode-python-driver 
Add salt-cloud driver backed by linode-python.
 2015-02-05 20:38:28 -07:00
Seth House
7916bb625e Note non-standard SSE tag field; update examples for new event tag style 
The addition in a720149 was incorrect. The SSE spec has an optional
field called 'event' not 'tag' which specifies the event type.

Unfortunately the EventSource client can only subscribe to either all
events without a type or to events with a specified type. There is no
way to subscribe to all events with varying types. The best workaround
is to keep the tag in the event data, subscribe to all events, and
filter on tags manually.

Fortunately the SSE spec specifies that unknown fields should be ignored
so this addition is still useful for clients that don't mind deviating
from the spec and we can keep from breaking backward-compat.
 2015-02-05 20:24:13 -07:00
C. R. Oldham
e22f591a33 Pylint 2015-02-05 19:58:05 -07:00
C. R. Oldham
be96900477 Pylint 2015-02-05 19:42:11 -07:00
Seth House
da45f63b9f Fixed incorrect rST cross-ref 2015-02-05 19:15:46 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Joseph Hall
967191f6ef Merge pull request #20442 from rallytime/pylint_seven 
Fix etcd_return pylint error
 2015-02-05 17:57:19 -07:00
C. R. Oldham
ba66f44bd9 Pylint 2015-02-05 17:24:01 -07:00
rallytime
e4d8db4160 Fix etcd_return pylint error 2015-02-05 16:42:41 -07:00
Joseph Hall
89d3cc2944 Ensure that creds is a dict (pagerduty) 2015-02-05 16:20:05 -07:00
C. R. Oldham
30c92061a0 Fix pylint 2015-02-05 22:50:49 +00:00
Mike Place
864a674e0e Merge pull request #20438 from basepi/cmdrunerrors 
Return the data from cmd.run with cmd.shell
 2015-02-05 15:39:12 -07:00
Colton Myers
084b0c81b0 Return the data from cmd.run with cmd.shell 2015-02-05 15:37:37 -07:00
C. R. Oldham
86d389de4b Add salt-cloud driver for linode-python binding library 2015-02-05 22:17:24 +00:00
Thomas S Hatch
79b3f0d7d0 Merge pull request #20430 from kim0/freebsd-status-is-done 
FreeBSD support for module status .. is done (fixes #20045)
 2015-02-05 14:07:16 -07:00
Kaithar
cd5d70ca6e Compare against None rather than basing off anything that evaluates true 2015-02-05 14:03:52 -07:00
Thomas S Hatch
ed640db3e5 Merge pull request #20398 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-05 14:02:30 -07:00
Thomas S Hatch
7943a60954 Merge pull request #20377 from Unity-Technologies/pass-envs-virtualenv 
Added the ability to pass env_vars to pip via the virtualenv.managed sta...
 2015-02-05 14:01:47 -07:00
Mike Place
bc99eb80eb Don't run cron as a user with -u on Linux 
Fixes #19916
 2015-02-05 13:57:11 -07:00
Thomas S Hatch
43b59d72dc Merge pull request #20342 from atbell/GH-20322_fix_cert_creation_in_tls_module 
Fixes #20322, check for existing cert, return CN (not ca_name)
 2015-02-05 13:48:26 -07:00
Ahmed Kamal
3bbcd60eb4 FreeBSD support for module status .. is done 2015-02-05 22:32:22 +02:00
Joseph Hall
fc22ca5790 Merge pull request #20389 from jfindlay/fix_pip_venv 
fix pip venv regression, deprecate activate param
 2015-02-05 12:51:15 -07:00
Joseph Hall
03166a2630 Merge pull request #20410 from jodv/2015.2 
Backport: fix syndic getting user from kwarg
 2015-02-05 12:45:31 -07:00
Joseph Hall
aee80341b7 Merge pull request #20368 from kaithar/feature/smarter-value-extraction 
Make the value extraction a little smarter.
 2015-02-05 12:41:24 -07:00