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
57,822 Commits 24 Branches 182 Tags 341 MiB
928ef59a8a
Commit Graph

57822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heinz Wiesinger
48023669e7 Support permanent per interface firewalld zone configuration on rh7 systems. 
Fixes #27222
 2015-09-18 14:17:08 +02:00
Thomas Jackson
e7526bdb44 Correctly support https, port 443 is not a requirement 2015-09-17 19:05:10 -07:00
rallytime
808a5b3b81 Make sure we set the full data to the ret variable 2015-09-17 17:54:09 -06:00
rallytime
9b635004e2 Refactor some digital_ocean functions to help simplify the driver 2015-09-17 17:36:28 -06:00
Colton Myers
a84ce67b8f Add test.nop state 
A no-op state that does nothing. Useful in conjunction with the `use`
requisite, or in templates which could otherwise be empty due to jinja
rendering

Unlike test.succeed_without_changes, takes **kwargs to be more flexible.

Also removed the test stuff from succeed_without_changes. If a state
doesn't make changes, its behavior should be identical whether in test
mode or not.
 2015-09-17 17:22:49 -06:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-17 13:53:22 -06:00
Justin Findlay
1b620b77cd rename hash_host arg to hash_known_hosts 
Fixes #27187.
 2015-09-17 12:41:19 -06:00
Justin Findlay
12f14ae37c update hash_known_hosts docs in ssh module 2015-09-17 12:08:49 -06:00
Mike Place
430c48c5ea Merge pull request #27195 from jacobhammons/doc-build 
Fixed sphinx / latex build warnings and errors
 2015-09-17 11:28:37 -06:00
Mike Place
7a34c7742d Merge pull request #27172 from rallytime/bp-27150 
Back-port #27150 to 2015.5
 2015-09-17 11:25:51 -06:00
Mike Place
8f8e75c5ff Merge pull request #27182 from Awingu/2015.8 
fix restart_on_error
 2015-09-17 11:24:01 -06:00
rallytime
6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys() 
Fixes #24573
 2015-09-17 11:08:08 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Jacob Hammons
fad87e34a2 Fixed lint errors 2015-09-17 10:27:54 -06:00
Justin Findlay
e956d88f5f Merge pull request #27194 from rallytime/bp-27180 
Back-port #27180 to 2015.5
 2015-09-17 10:17:24 -06:00
Mike Place
97d2a5fddc Merge pull request #27163 from terminalmage/issue27093 
Workaround upstream tornado bug affecting redirects
 2015-09-17 10:09:01 -06:00
Jacob Hammons
e56f02b025 re-add cheatsheet do-over 2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561 re-added cheatsheet.tex 2015-09-17 09:29:09 -06:00
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Colton Myers
a02d043309 Merge pull request #27176 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-17 09:00:40 -06:00
Bernard Kerckenaere
693b81f7e4 fix restart_on_error #27127 2015-09-17 09:52:31 +02:00
Joseph Hall
65c59ec2ea Merge pull request #27177 from rallytime/fix-19954 
Remove note - incorrect info
 2015-09-16 19:34:03 -06:00
rallytime
531b44243d Remove note - incorrect info 2015-09-16 19:30:03 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Joseph Hall
cbb7e7f1a5 Merge pull request #27173 from rallytime/fix-19954 
Add the ability to specify multiple disks on the SoftLayer driver
 2015-09-16 18:32:57 -06:00
rallytime
45c6aabde9 DeviceID '1' is reserved for the SWAP disk; let's skip it. 2015-09-16 17:24:30 -06:00
rallytime
54e104cf5b Don't stacktrace if local_disk isn't set 2015-09-16 17:07:41 -06:00
rallytime
fe74d203f5 Add the ability to specify multiple disks on the SoftLayer driver 
Refs #19954
 2015-09-16 16:46:02 -06:00
Joseph Hall
de2027426e Merge pull request #27170 from rallytime/gce-docs 
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
 2015-09-16 16:23:51 -06:00
Mike Place
0d7ee4b209 Merge config values from master.d/minion.d conf files 
Refs #18582
 2015-09-16 14:21:43 -06:00
Justin Findlay
28cfdfd067 Merge pull request #27167 from rallytime/bp-27148 
Back-port #27148 to 2015.5
 2015-09-16 13:56:01 -06:00
Nicole Thomas
4495f4f4d0 Merge pull request #27168 from techhat/gateimpacket 
Add further gating of impacket library
 2015-09-16 12:55:56 -06:00
Nicole Thomas
0e04588d58 Merge pull request #27164 from rallytime/add-26824-changes-to-2015.8 
Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8
 2015-09-16 12:55:17 -06:00
rallytime
a07db909bd Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples 2015-09-16 12:51:47 -06:00
Joseph Hall
cc448bfdc1 Add further gating of impacket library 2015-09-16 11:54:49 -06:00
Joseph Hall
3e5ef0dc30 Merge pull request #27166 from rallytime/fix-27100 
Allow a full-query for EC2, even if there are no profiles defined
 2015-09-16 11:41:40 -06:00
William Huba
d12be52355 Pass filepointers to the serialize load functions. 2015-09-16 10:55:20 -06:00
rallytime
50fb3a489a Allow a full-query for EC2, even if there are no profiles defined 
Fixes #27100
 2015-09-16 10:48:17 -06:00
Mike Place
f1c9de7ed9 Merge pull request #27162 from rallytime/softlayer-service 
Be explicit in using "SoftLayer" for service queries in SoftLayer drivers
 2015-09-16 10:43:26 -06:00
Erik Johnson
80b396db73 Handle potential ValueError when checking content length 
This should never happen if the remote webserver is working properly,
but I'm paranoid and want to cover this corner case.
 2015-09-16 11:42:00 -05:00
Erik Johnson
a89c987943 Remove unused import 
This import was added during the implementation of
https://github.com/saltstack/salt/pull/27163, but that approach was
later scrapped.
 2015-09-16 11:42:00 -05:00
Erik Johnson
469e18f74c Workaround upstream tornado bug affecting redirects 
See the following:

- https://github.com/saltstack/salt/issues/27093#issuecomment-140155828
- https://github.com/tornadoweb/tornado/issues/1518
 2015-09-16 11:42:00 -05:00
Erik Johnson
f2a562ac60 Add salt.utils.files.rename() for cross-platform renaming 2015-09-16 11:42:00 -05:00
Erik Johnson
38d93a96fe Merge pull request #27143 from cachedout/clean_grains_cache_on_sync 
Clean grains cache on grains sync
 2015-09-16 11:27:06 -05:00
Mike Place
0a660a9f80 Break apart long line 2015-09-16 09:41:41 -06:00
Erik Johnson
626cbe61ce Merge pull request #27150 from cachedout/issue_18582 
Merge config values from master.d/minion.d conf files
 2015-09-16 10:36:41 -05:00
rallytime
a44bd763dd Make sure changes from #26824 to digital_ocean_v2.py driver make it to digital_ocean.py in 2015.8 2015-09-16 09:22:35 -06:00
rallytime
d281068c70 Be explicit in using "SoftLayer" for service queries in SoftLayer drivers 2015-09-16 09:07:24 -06:00