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
35,661 Commits 24 Branches 182 Tags 341 MiB
4abc45397d
Commit Graph

35661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Thomas S Hatch
ffc74f28a3 Merge pull request #15139 from Ryanl92/patch-1 
Fix missing argument in file.replace
 2014-08-21 10:55:23 -06:00
Thomas S Hatch
45f447fa84 Merge pull request #15138 from whiteinge/reactor-file_roots 
Add salt:// support to Reactor sls files
 2014-08-21 10:54:43 -06:00
Thomas S Hatch
72ab5a585a Merge pull request #15137 from garethgreenaway/15087_debian_network_system_fixes 
Fixes to debian_ip
 2014-08-21 10:54:03 -06:00
Thomas S Hatch
57a0db7190 Merge pull request #15136 from lyft/reload-grains-with-modules-for-states 
Reload grains with modules for states
 2014-08-21 10:52:42 -06:00
Thomas S Hatch
8c4050aeb1 Merge pull request #15132 from cachedout/fail_reason 
Give user a reason a minion did not return
 2014-08-21 10:48:53 -06:00
Thomas S Hatch
8834ca9d91 Merge pull request #15130 from basepi/fullsummary 
Show all but list of unreturned minions with --summary
 2014-08-21 10:48:07 -06:00
Thomas S Hatch
ef9494536e Merge pull request #15129 from rallytime/schedule_docs 
Fix broken link in schedule docs
 2014-08-21 10:47:21 -06:00
Thomas S Hatch
2f94a25d23 Merge pull request #15128 from rallytime/remove_unused_kwargs 
Remove **kwargs from pkg.upgrade functions
 2014-08-21 10:46:44 -06:00
Thomas S Hatch
854bf8aff5 Merge pull request #15126 from notpeter/develop 
Improve 2014.7.0 release notes.
 2014-08-21 10:37:25 -06:00
Thomas S Hatch
20cfd65d56 Merge pull request #15124 from AccelerationNet/win_services-shell-escaping 
win: use `subprocess.list2cmdline` to sanitize user input
 2014-08-21 10:36:10 -06:00
Thomas S Hatch
9a550db1df Merge pull request #15121 from wackycaptain/fix-ssh-auth-present-test 
Fix ssh_auth.present test when enc != ssh-rsa
 2014-08-21 10:32:37 -06:00
Thomas S Hatch
b609c41ddd Merge pull request #15119 from lyft/proper-returns-for-boto-states 
Return True by default in boto states
 2014-08-21 10:27:38 -06:00
Thomas S Hatch
33eb7d4692 Merge pull request #15118 from cachedout/range_docs 
Document seco range
 2014-08-21 10:25:32 -06:00
Thomas S Hatch
6958e71eda Merge pull request #15112 from samuelpenn/develop 
Added support for wildcard characters in package version strings.
 2014-08-21 10:24:12 -06:00
Thomas S Hatch
33d1c1d10a Merge pull request #15079 from garethgreenaway/apt_dont_install_recommends 
Changes to aptpkg.py and pkg state
 2014-08-21 10:16:28 -06:00
Thomas S Hatch
8a3e892f47 Merge pull request #15064 from tserong/patch-1 
Fix service.py version parsing for SLE 11
 2014-08-21 10:15:58 -06:00
Thomas S Hatch
45e71cdd30 Merge pull request #15060 from YanChii/file_append_bug 
corrected file.append test state
 2014-08-21 10:15:12 -06:00
Samuel Penn
ff19919f24 Merge remote-tracking branch 'upstream/develop' into develop 2014-08-21 13:44:38 +01:00
Ryan Lewis
a6662bc975 Fix missing argument to new_file.insert 2014-08-21 16:31:10 +12:00
Seth House
c05f250d96 Add salt:// paths for reactor files to the doc examples 2014-08-20 21:14:29 -06:00
Seth House
c087f48e78 Added salt:// support to reactor file paths 
Closes #12827
 2014-08-20 21:14:29 -06:00
Seth House
30e8fb653a Line up comments in reactor example 2014-08-20 21:14:29 -06:00
Seth House
2cd0fa6223 Document that globs can be used in reactor filenames 2014-08-20 21:14:29 -06:00
Colton Myers
e5fadf15e9 Merge branch '2014.7' into develop 2014-08-20 18:52:48 -06:00
Colton Myers
dee6021f74 Merge pull request #15135 from saltstack/fp-15078 
Forward-port #15078 to 2014.7
 2014-08-20 18:52:34 -06:00
Joseph Hall
1f642d823f Merge pull request #15120 from gtmanfred/develop 
automatically use novaclient plugins
 2014-08-20 18:28:38 -06:00
Gareth J. Greenaway
2a638410a3 Cleanup and bug fixes in the network_settings related functions of the debian_ip module. These fixes allow changes to hostname and the networking services to be reported, useful in states, etc. 2014-08-20 17:09:38 -07:00
Pedro Algarvio
ac7174f9f6 Merge pull request #15113 from rallytime/remove_OrderedDict 
Use salt.utils.odict instead of python2.7 OrderedDict
 2014-08-21 00:13:25 +01:00
Ryan Lane
38d6d1253f Reload grains when reloading modules for states 2014-08-20 15:50:50 -07:00
Gajdos Tamás
bbb585b3db Change how salt-ssh connects with sshpass. 
When the 'passwd' option is set in the rooster file for a host, then salt won't use PubkeyAuthentication even if it is already set up.
 2014-08-20 16:34:25 -06:00
Mike Place
1a2ef652b4 Give user a reason a minion did not return 
Gives the user who selects a verbose output a best guess on why the
minion did not return a response.
 2014-08-20 16:13:18 -06:00
rallytime
ded01bfefd Fix broken link in schedule docs 2014-08-20 16:10:03 -06:00
Colton Myers
04c8f75c37 Show all but list of unreturned minions with --summary 2014-08-20 16:09:36 -06:00
Peter Tripp
49aa196140 Improve 2014.7.0 release notes. 2014-08-20 14:56:58 -07:00
Ryan Davis
398af965a6 win: use subprocess.list2cmdline to sanitize user input 
The `win_services` module uses `string.format` to build commands that
get run on the shell, performing some simple defenses against bad user
input.

Most look like `'net stop "{0}"'.format(name)`, where `name` comes
from user input, using double quotes to permit names containing
spaces.

`subprocess.list2cmdline` solves the escaping problem more robustly.
 2014-08-20 17:33:11 -04:00
rallytime
b648ec1eb8 Remove **kwargs from pkg.upgrade functions 
Fixes #14976
 2014-08-20 15:02:32 -06:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
wackycaptain
287e5979be Fix ssh_auth.present test when enc != ssh-rsa 2014-08-20 22:19:32 +02:00
Daniel Wallace
2f87f64a69 clean up kwargs 2014-08-20 15:00:40 -05:00
Daniel Wallace
f53f75c9f4 pylint fix 2014-08-20 14:58:46 -05:00
Daniel Wallace
40d8263ca8 kwargs should be vm_ 
this allows for specifying stuff to configure novaclient plugins, in the
cloud.profiles, such as public: False service_net: True
 2014-08-20 14:57:00 -05:00
Daniel Wallace
880c9c45af automatically use novaclient plugins 
no more having to specify what module the extension should overwrite
 2014-08-20 14:27:24 -05:00
Ryan Lane
436a120e2d Fixes for test mode for boto_asg 2014-08-20 12:09:10 -07:00
Ryan Lane
2d7a93b70a Return True by default in boto states 
This change sets the default return value of the boto states to True,
rather than None as previously set. None is now used for test runs.
Failures still use False.
 2014-08-20 11:16:52 -07:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
C. R. Oldham
d19fd2194f Merge pull request #15103 from terminalmage/pkg.latest-catch-exception 
Catch exception raised when pkg.refresh_db is called
 2014-08-20 11:18:54 -06:00
C. R. Oldham
5caf4e35c9 Merge pull request #15098 from s0undt3ch/issues/14979-output-file-permissions 
Trim the output file as opposed to delete to keep same permissions.
 2014-08-20 11:16:42 -06:00
C. R. Oldham
e2f3c61cf4 Merge pull request #15100 from s0undt3ch/features/out-file-append 
Add support for `--output-file-append`
 2014-08-20 11:10:20 -06:00
Joseph Hall
da5b397cad Merge pull request #15114 from rallytime/remove_jenkins_compound_matching 
Remove compound matching from jenkins.py
 2014-08-20 10:53:21 -06:00