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

45479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
d3924af554 Merge pull request #21035 from basepi/salt-ssh-salt-api-2015.2-20418 
[2015.2] Extend fix from #21034 to new code in 2015.2
 2015-02-25 16:09:24 -07:00
Colton Myers
9c7696dc4d Extend fix from #21034 to new code in 2015.2 2015-02-25 12:21:32 -07:00
Mike Place
de441aba35 Merge pull request #21001 from jacksontj/2015.2 
Fix #19658 (_pillar not having access to minion grains)
 2015-02-25 10:11:46 -07:00
Mike Place
aa0308267b Merge pull request #20967 from s0undt3ch/features/system-encoding-detection-2015.2 
Add system encoding detection
 2015-02-25 10:03:32 -07:00
Mike Place
14f522cbbe Merge pull request #21014 from wt/2015.2-flake8_on_jinja_py 
Fix all flake8 issues in a one file.
 2015-02-25 09:20:42 -07:00
Mike Place
5e0efed289 Merge pull request #21003 from jacksontj/saltnado 
Better dep checking in rest_tornado
 2015-02-25 09:18:08 -07:00
Mike Place
237533994b Merge pull request #20982 from cachedout/id_event 
ID field for event returns in mysql
 2015-02-25 09:15:17 -07:00
Warren Turkal
26f32ee5c7 Fix all flake8 issues in one file. 2015-02-24 23:08:42 -08:00
Thomas Jackson
9ae0408ae8 Typo fix 2015-02-24 20:56:57 -08:00
Nicole Thomas
8d013efe66 Merge pull request #21000 from rallytime/skip_ec2_tests 
Skip the ec2 nightly cloud tests for now
 2015-02-24 17:38:57 -07:00
Thomas Jackson
8ed18ce9f5 Better dep checking in rest_tornado 
This should help alleviate issues some people have found (such as #20945) where the module loads but then immediately crashes
 2015-02-24 15:50:19 -08:00
Nicole Thomas
04ad80ec98 Merge pull request #20973 from jfindlay/net_cmds 
add python_shell=True to shell cmds in network mod
 2015-02-24 16:41:17 -07:00
Thomas Jackson
f538d41c35 Fix #19658 
We used to do all this work to keep the modules around for each and every run-- but that causes a lot of fun problems since grains (and hence modules that should load) could change.

Since the loader is now lazy we can just let each pillar builder use its own.
 2015-02-24 15:16:37 -08:00
rallytime
95d4fb801c Skip the ec2 nightly cloud tests for now 
Something fundamental has changed with the way ec2 interacts with
the test runner starting in 2015.2 (and consequentially develop).
Let's skip these tests for now until we can pin down why so we don't
muddy the cloud-testing waters.
 2015-02-24 16:07:23 -07:00
Colton Myers
af686771fe Remove duplicate requisites 2015-02-24 14:45:32 -07:00
jfindlay
02d4d75194 Merge pull request #20985 from rallytime/bp-20974 
Backport #20974 to 2015.2
 2015-02-24 14:35:40 -07:00
Mike Place
d31913118f ID field for event returns in mysql 2015-02-24 12:20:25 -07:00
Johannes Ebke
a86467dde3 Fix expr_match usage in salt.utils.check_whitelist_blacklist 2015-02-24 12:17:45 -07:00
Nicole Thomas
10e3380e96 Merge pull request #20978 from techhat/azureimages 
Tidy up --list-images in Azure driver
 2015-02-24 11:33:34 -07:00
Thomas S Hatch
54af420e3e Merge pull request #20958 from cachedout/runner_out_2015_2 
Outputter support for runners
 2015-02-24 11:32:14 -07:00
Thomas S Hatch
2b7858d98b Merge pull request #20904 from jacksontj/2015.2 
Fix for #20869
 2015-02-24 11:23:47 -07:00
Joseph Hall
5e247752a1 Tidy up --list-images in Azure driver 2015-02-24 10:54:31 -07:00
Justin Findlay
e2cd635902 add python_shell=True to shell cmds in network mod 
fixes #20833
 2015-02-24 09:18:18 -07:00
Pedro Algarvio
bd195af136 Add __salt_system_encoding__ to the known globals 2015-02-24 13:08:14 +00:00
Pedro Algarvio
92dfa30cde Add the detected system encoding to the locale grains 2015-02-24 13:05:22 +00:00
Pedro Algarvio
a247dc0dcb Add system encoding detection 
Try to detect the system encoding as soon as possible.
`sys.stdin.encoding` is the most reliable source but it's reset to
`None` once a process is daemonized. If it's none, follow additional
paths to retrieve this information.
 2015-02-24 12:59:50 +00:00
jfindlay
4f0d01f21a Merge pull request #20964 from rallytime/bp-19790 
Backport #19790 to 2015.2
 2015-02-23 22:40:10 -07:00
Mike Place
664514d4c7 Remove unnecessary comment 2015-02-23 21:44:13 -07:00
Mike Place
0ad133d687 Fix multi-master event handling bug 
We had a situation wherein minion generators would race to the sub
socket and only a single minion would actually act on the package. The
result was that events such as refresh_pillar would cause one (or
sometimes both) minions to stop responding. This changes the behaviour
so that the first instance to get the request calls action on all
instances.

While this has the possible side-effect of blocking for O(n) inside the event
handling loop, it also ensures that multi-master minions update in a
linear fashion.
 2015-02-23 21:44:12 -07:00
Mike Place
a3e27f6a4e No need for the None as a default. (Thanks @terminalmage) 2015-02-23 18:18:14 -07:00
Mike Place
524c8f0e35 Use a designated outputter if one is supplied 2015-02-23 17:17:01 -07:00
Mike Place
c579416a4b Add output options to salt-run parser 2015-02-23 17:14:43 -07:00
jfindlay
39e9824031 Merge pull request #20952 from rallytime/bp-20843 
Backport #20843 to 2015.2
 2015-02-23 17:00:39 -07:00
Mathieu Drapeau
46a18a5e3b Adding current module directory to the sys.path in order to 
avoid dependencies import errors for other modules at the same
level. (https://github.com/saltstack/salt/issues/16556)
 2015-02-23 15:56:45 -07:00
jfindlay
d7b3f5d2f1 Merge pull request #20939 from makinacorpus/fp_2015 
More fopen fixes
 2015-02-23 15:13:20 -07:00
Colton Myers
fe87cc6eef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/returners/smtp_return.py
	salt/state.py
	salt/states/dockerio.py
 2015-02-23 14:22:27 -07:00
Mathieu Le Marec - Pasquet
5bd8727600 More fopen fixes 
This fixes #20931
 2015-02-23 21:04:01 +01:00
jfindlay
55e7927077 Merge pull request #20922 from bbinet/2014.7_fix20921 
2014.7: fix issue 20921
 2015-02-23 08:35:02 -07:00
jfindlay
3ccd9620f0 Merge pull request #20923 from bbinet/2015.2_fix20921 
2015.2: fix issue 20921
 2015-02-23 08:34:55 -07:00
Robin Björklin
b0cb8c8166 Fixed problem with tags occuring twice with docker.pulled 2015-02-23 12:33:47 +01:00
Robin Björklin
c0f9b9dd8d Fixed problem with tags occuring twice with docker.pulled 2015-02-23 11:37:24 +01:00
Sebastien Estienne
c53ce9d0d9 Docker: improve tags support 
Conflicts:
	salt/states/dockerio.py
 2015-02-23 11:37:03 +01:00
jfindlay
3a61abf639 Merge pull request #20911 from rallytime/fix-20906 
Change the order of -R and -m in linux_acl.modfacl
 2015-02-22 01:06:46 -07:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
rallytime
965d596903 Change the order of -R and -m in linux_acl.modfacl 
Fixes #20906
 2015-02-21 18:49:06 -07:00
Thomas Jackson
9cec10cf2c Fix for #20869 
Pack "runners" in __salt__ within the runners
 2015-02-21 12:36:11 -08:00
Mike Place
081867c7d4 Merge pull request #20895 from bechtoldt/2014.7 
fix wrong dict access in smtp returner in 2014.7
 2015-02-21 07:02:47 -07:00
Arnold Bechtoldt
8ee52d65e1 fix wrong dict access in smtp returner, that is already fixed in 2015.2 
and later
 2015-02-21 11:38:32 +01:00
jfindlay
d28a995892 Merge pull request #20887 from jfindlay/fopen 
pylint #20878
 2015-02-20 21:56:47 -07:00
jfindlay
fecbc4f509 Merge pull request #20886 from saltstack/revert-20883-try_chown 
Revert "try/except salt.utils.fopen chown of file"
 2015-02-20 21:53:15 -07:00