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
44,641 Commits 24 Branches 182 Tags 341 MiB
79e5ad40ba
Commit Graph

44641 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
 2015-01-20 15:19:53 -07:00
Colton Myers
639c84e833 Merge pull request #19887 from basepi/defaultdatayamldocs 
Fix code block explanation in starting states tutorial
 2015-01-20 15:05:32 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
Thomas S Hatch
ba505e4680 Merge pull request #19825 from jfindlay/fix_lvcreate 
remove redundant code, append extra_arguments to cmd
 2015-01-20 14:55:21 -07:00
Thomas S Hatch
ef3d51c0f6 Merge pull request #19820 from highlyunavailable/feature/2014.7_fix_file_recurse_windows 
Force roots fileclient on Masterless Windows to return fake POSIX/"url"
 2015-01-20 14:53:53 -07:00
Thomas S Hatch
ef8e457360 Merge pull request #19886 from thatch45/pedro_doh 
@s0undt3ch copy pasta breaks pillar!
 2015-01-20 14:41:32 -07:00
Thomas S Hatch
c2be438803 @s0undt3ch copy pasta breaks pillar! 2015-01-20 14:40:20 -07:00
Seth House
76547b90ba Also catch TokenAuthenticationError tracebacks to properly raise a 401 2015-01-20 12:59:10 -08:00
rallytime
99e35ffb1e Add 2014.7.1 release to Windows Installation Docs 
Also remove the links to the 2014.7.0 exe's because of regressions.
 2015-01-20 12:21:57 -07:00
Mike Place
b46e18c4be Fixup returner handling. 
Closes #19807
 2015-01-20 12:18:55 -07:00
Seth House
a5d22fb756 Added depends section to Azure cloud module docstring 2015-01-20 10:52:47 -08:00
Flavian
b4213edbec Fixes #19597 2015-01-20 16:44:24 +01:00
Kevin Bowling
41263ffd9f Add FreeBSD support to ssds grain 2015-01-20 03:52:35 -07:00
Kevin Bowling
494543c5bc Add freebsdkmod changes to 2014.7.2 relnotes 2015-01-20 02:09:32 -07:00
Ronald van Zantvoort
5464d701b8 Fix SysCtl check; when a key contains a /, it should be translated to a dot 
(for example VLAN interfaces; net.ipv6.conf.bond0/560.use_tempaddr = 0)
 2015-01-18 17:51:54 +01:00
Ronald van Zantvoort
3d3b219047 Fix MTU setting in network.managed for RH systems 2015-01-18 15:49:51 +01:00
jfindlay
327eb8e744 Merge pull request #19827 from jfindlay/pylint_2014.7 
change perms on some tests/ files
 2015-01-17 19:58:27 -07:00
Justin Findlay
eaa704cf47 change perms on some tests/ files 2015-01-17 19:32:43 -07:00
Justin Findlay
581b6eaaa1 properly decode jinja rendering, fixes #19173 2015-01-17 18:02:11 -07:00
Justin Findlay
1ae321bbb5 remove redundant code, append extra_arguments to cmd 2015-01-17 17:25:10 -07:00
Highly Unavailable
d2853fd1f1 Force roots fileclient on Masterless Windows to return fake POSIX/"url" paths 
Fixes #19815, reverts part of #19805 but fixes #14048 in a different
manner.

This is somewhat of an experimental pull request since I'm not quite sure
how to test this due to how differently the Windows client is packaged vs
the Linux one.

I'm mostly sure it won't break anything - the various file operations
(managed, recurse, etc.) still SEEM to work - but I would like another
pair of eyes/test passes on this for sure.

What this does is forces all paths returned by the "roots" fileserver into
the POSIX form (/x/y/z) rather than the Windows form (\x\y\z) despite
being on Windows. It also then uses os.path.normpath to convert the
filepaths back into the Windows versions before using them in find_file
and serve_file. In theory this should mean that everything works just
fine, but it certainly is possible that if paths are being checked in some
other place, it might break them because it thinks it's a POSIX path.
 2015-01-17 14:14:22 -08:00
Thomas S Hatch
3bf221c7af Merge pull request #19809 from garethgreenaway/fix_schedule_reload 
Fixes to scheduler in 2014.7
 2015-01-16 17:07:32 -07:00
Thomas S Hatch
f41a1631e2 Merge pull request #19805 from highlyunavailable/feature/2014.7.1_fixwinpkg 
Fixes #14048 and also a bug in win_servermanager
 2015-01-16 17:07:09 -07:00
Thomas S Hatch
ffcf7ce385 Merge pull request #19789 from jfindlay/hosts_eol 
end /etc/hosts with EOL to not break utils that read it
 2015-01-16 17:04:51 -07:00
Thomas S Hatch
6736f6dd9a Merge pull request #19804 from basepi/salt-ssh.arg.yamlify.19773 
Fix for passing pillar to state runs in salt-ssh
 2015-01-16 16:56:05 -07:00
Gareth J. Greenaway
787322f920 Fixing bug with schedule.reload if the saved schedule file existed but was empty. 2015-01-16 14:54:11 -08:00
Colton Myers
372a49b7d0 Split this out to satisfy the pylint gods 2015-01-16 15:08:15 -07:00
Colton Myers
da4e686d96 Fix my over-zealousness for pillar updates 2015-01-16 14:59:54 -07:00
Highly Unavailable
ef1ba92f67 Fixes #14048 and also a bug in win_servermanager 
14048 causes custom modules to not be loaded on a Masterless Windows
minion. This commit adds code to use os.path.sep for the path ONLY if the
fileclient is local. There should be no effect on any master-based
minions, and no effect on Linux minions, only Masterless Windows.

If the add-windowsfeature output is very long, PowerShell will force a
linebreak, causing an error. This discards lines that do not conform to
the parsable format because they're not actually used anyway.
 2015-01-16 13:26:00 -08:00
Colton Myers
70e63d74ac Update pillar from command line for state runs in salt-ssh 2015-01-16 14:24:53 -07:00
Colton Myers
6664a500a7 Don't condition the arg output 2015-01-16 13:36:32 -07:00
Colton Myers
d76dc7be5c Pass in argv 2015-01-16 13:35:05 -07:00
Thomas S Hatch
5fb9e913fc Merge pull request #19798 from jfindlay/fix_msiexec 
fix msiexec cmd, #19796
 2015-01-16 13:34:53 -07:00
Colton Myers
55492cc283 Use salt.utils.args for salt-ssh arg parsing 2015-01-16 13:31:51 -07:00
Colton Myers
18a75e2055 Remove the extra, unused cmd function 2015-01-16 13:30:34 -07:00
Justin Findlay
136386d557 fix msiexec cmd, #19796 2015-01-16 13:22:21 -07:00
Justin Findlay
2506d3491e end /etc/hosts with EOL to not break utils that read it 
fixes #19738
 2015-01-16 10:19:26 -07:00
rallytime
2c57d8ba6a Merge branch '2014.7' into 2015.2 2015-01-16 00:30:41 -07:00
Nicole Thomas
0b9d02d292 Merge pull request #19781 from rallytime/pylint_dance 
Pylint fix for 2014.7
 2015-01-16 00:24:19 -07:00
Nicole Thomas
afc4433d07 Merge pull request #19771 from basepi/merge-forward-2015.2 
Merge forward 2014.7 to 2015.2
 2015-01-16 00:10:55 -07:00
rallytime
6ca91176da Pylint fix for 2014.7 2015-01-16 00:09:34 -07:00
Thomas S Hatch
5678558e1d Merge pull request #19777 from garethgreenaway/fix_schedule_list 
fixes to schedule module in 2014.7
 2015-01-15 21:58:19 -07:00
Gareth J. Greenaway
08c9bc9c12 fixing a bug where schedule.list would error out if it encountered a configuration item that wasn't in the list of supported items. 2015-01-15 20:09:28 -08:00
Thomas S Hatch
cf0709ff5d Merge pull request #19770 from terminalmage/lint 
Fix incorrect variable name
 2015-01-15 17:43:51 -07:00
Erik Johnson
769ebe7a98 Fix lint failure 2015-01-15 17:38:51 -06:00
Colton Myers
d1b201e2bf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/runners/manage.py
	salt/utils/cloud.py
 2015-01-15 16:20:48 -07:00
Erik Johnson
6216d17e5a Fix incorrect variable name 2015-01-15 16:59:02 -06:00
Thomas S Hatch
d3fc81ebcb Merge pull request #19742 from basepi/saltssh.msgpack.remove.7913 
[DO NOT MERGE] Remove msgpack from thin generation for salt-ssh
 2015-01-15 15:41:59 -07:00
Thomas S Hatch
ce2e4027d5 Merge pull request #19758 from techhat/showservice 
Add show_service() function to msazure
 2015-01-15 15:41:01 -07:00
Thomas S Hatch
1200db5325 Merge pull request #19745 from techhat/urllib2-2015.2 
Default http.query() to urllib2, but still allow requests
 2015-01-15 15:40:26 -07:00