valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,467 Commits 24 Branches 182 Tags 341 MiB
d0b9ececa4
Commit Graph

57467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Theodore Cowan
d0b9ececa4 Update http.py 
fix for https://github.com/saltstack/salt/issues/21917
 2015-09-11 15:46:11 -06:00
C. R. Oldham
0e7555089f Merge pull request #27060 from cro/proxy_grains_breakage 
Fix grains breakage when hosts are not Linux, Windows, or SunOS
 2015-09-11 11:28:49 -06:00
Nicole Thomas
8ee87b9f61 Merge pull request #27051 from rallytime/bp-26953 
Back-port #26953 to 2015.8
 2015-09-11 10:28:20 -06:00
rallytime
eac9d9aba9 Pylint Fix 2015-09-11 09:49:14 -06:00
C. R. Oldham
e697326f1b Don't check for proxy in the individual is_linux/is_windows/etc functions. This breaks too many things. 2015-09-11 09:30:42 -06:00
dsumsky
453440753c - fixed pylint warnings 2015-09-11 09:05:58 -06:00
dsumsky
b40dfa459e - fixed broken caching in S3 ext_pillar module (file_md5 was a list) 
- added debugging messages
- static parameters are available as module parameters now
 2015-09-11 09:05:58 -06:00
Pedro Algarvio
249f55cd8c Merge pull request #26864 from terminalmage/fix-git_pillar-tests 
Only do git_pillar preflight checks on new-style git_pillar configs
 2015-09-11 08:47:12 +01:00
Justin Findlay
efaedb8aea Merge pull request #26967 from TheBigBear/patch-4 
new URL for windows salt downloads
 2015-09-10 14:51:33 -06:00
Justin Findlay
757d3c4eab Merge pull request #26921 from terminalmage/legacy_git_pillar_tests 
Get rid of error in legacy git pillar when using branch mapping notation
 2015-09-10 14:06:29 -06:00
C. R. Oldham
68eb508e6c Merge pull request #26923 from rallytime/cloud-cleanup 
Code clean up of cloud drivers and files
 2015-09-10 10:37:26 -06:00
Nicole Thomas
590c46f4e3 Merge pull request #27010 from rallytime/bp-26988 
Back-port #26988 to 2015.8
 2015-09-10 10:30:30 -06:00
Nicole Thomas
ec185d77fa Merge pull request #26985 from rallytime/versionadded-fix 
Fix versionadded tag
 2015-09-10 10:29:37 -06:00
rallytime
93b30b5ba8 Whitespace 2015-09-10 09:03:03 -06:00
rallytime
685fa911e7 Version Added for new apply_spm_config function 2015-09-10 08:42:33 -06:00
Pedro Algarvio
9612a6c7ad Process spm.d/*.conf and add prefix root dir support to SPM directories 2015-09-10 08:40:19 -06:00
jacobhammons
34324abe56 Merge pull request #26998 from jfindlay/2015.8 
generate pull request list v2015.8..v2015.8.0
 2015-09-09 13:42:49 -06:00
Justin Findlay
9aaca9338e generate pull request list v2015.8..v2015.8.0 
Also remove the changelogs generated for rc2 and rc3 in favor of a
unified list that shows all merged pull requests between the forking of
the 2015.8 branch and the release of 2015.8.0.
 2015-09-09 12:41:09 -06:00
Justin Findlay
3776f6cc12 Merge pull request #26993 from whiteinge/bp-26975 
Backport #26975
 2015-09-09 11:23:29 -06:00
Seth House
948ac92ff5 Add additional 'groups' check to rest_cherrypy if groups are not used 
Fixes #26974.
 2015-09-09 10:39:35 -06:00
Seth House
e47fe835c9 Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-09 10:39:35 -06:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
Mike Place
a25c9a33d0 Merge pull request #26970 from cachedout/issue_26839 
Revert "better path query parsing in fileserver"
 2015-09-09 10:06:57 -06:00
David Boucha
308d9b1408 Merge pull request #26980 from terminalmage/winrepo-unique-name 
Use human-readable cachedirs for gitfs-backed winrepo
 2015-09-09 11:02:13 -05:00
rallytime
79eb606cb7 Fix versionadded tag 2015-09-09 08:48:59 -06:00
Erik Johnson
415c001a38 Add link to winrepo.update_git_repos runner function for consistency. 2015-09-09 09:04:52 -05:00
Erik Johnson
1dd77e7003 Fix misspelled word 2015-09-09 09:02:55 -05:00
Erik Johnson
d05e7b0875 Add information on winrepo cachedir name overrides 2015-09-09 05:44:15 -05:00
Erik Johnson
a45bb90230 Remove block describing hashed winrepo cachedirs 
The behavior has now changed so this information is inaccurate.
 2015-09-09 05:44:15 -05:00
Erik Johnson
0c45781637 Don't clean old remotes by default 
This keeps non-git repo definitions from being removed win the winrepo
remotes are updated, unless clean=True is explicitly passed.
 2015-09-09 05:44:15 -05:00
Erik Johnson
0bd2848cb2 Add per-remote-only param support to salt.utils.gitfs 
This allows us to have an optional "name" param to be used to override
the cachedir and allow human-readable winrepo cachedirs to be supported.
 2015-09-09 05:44:15 -05:00
Erik Johnson
c3becf7886 Manually clear old remotes after fetching winrepo remotes 2015-09-08 22:27:30 -05:00
Erik Johnson
52dad42407 Rename PER_REMOTE_PARAMS to PER_REMOTE_OVERRIDES 
With the addition of per-remote-only params, this change in naming
reduces ambiguity.
 2015-09-08 22:03:49 -05:00
Justin Findlay
a604a1a289 Merge pull request #26969 from TheBigBear/patch-6 
URL of salt windows downloads has changed
 2015-09-08 16:23:28 -06:00
Justin Findlay
d87321361d Merge pull request #26968 from TheBigBear/patch-5 
URL of salt windows downloads has changed
 2015-09-08 16:23:02 -06:00
Mike Place
8b6a7b0d65 Revert "better path query parsing in fileserver" 
This reverts commit 29a023aaad.

This causes breakage outlined in #26839
 2015-09-08 14:47:50 -06:00
TheBigBear
21ea2f6b1b URL of salt windows downloads has changed 2015-09-08 21:43:59 +01:00
TheBigBear
febbdfdf46 URL of salt windows downloads has changed 2015-09-08 21:39:37 +01:00
TheBigBear
8d2c042cf7 new URL for windows salt downloads 
the old site stil exists, and looks almost up to date but am pretty sure all the really up to date and relevant stuff is (or should be!) now at https://repo.saltstack.com/windows/

I am also chanigng this from http to https, hope this has not undesireable side-effects?

Shouldn't the old docs.saltstack.com/windows directory be removed now?
 2015-09-08 21:37:15 +01:00
Pedro Algarvio
b45d0b2a21 Merge pull request #26958 from s0undt3ch/bradthurber-bootstrap-command-line-help-doc-update 
Bradthurber bootstrap command line help doc update
 2015-09-08 18:12:38 +01:00
Mike Place
24eec1babb Merge pull request #26949 from rallytime/bp-25148 
Back-port #25148 to 2015.8
 2015-09-08 11:10:08 -06:00
Pedro Algarvio
28069faffb Remove the /etc/salt prefix 
Closes #26890
 2015-09-08 17:26:48 +01:00
Pedro Algarvio
c586e43f63 Merge branch 'bootstrap-command-line-help-doc-update' of https://github.com/bradthurber/salt into bradthurber-bootstrap-command-line-help-doc-update 2015-09-08 17:13:47 +01:00
Thomas Jackson
795d8f022c AsyncPillar wrapper to fix file_client: local minions 
Fixes #24440
 2015-09-08 08:33:05 -06:00
rallytime
bf33c99b08 Remove redundant parentheses 2015-09-04 15:58:16 -06:00
rallytime
5045989be7 Make sure function names comply 2015-09-04 15:42:13 -06:00
rallytime
e327d9a8a4 Remove redundant parens 2015-09-04 15:10:28 -06:00
rallytime
eee0291ff8 Code clean up of cloud drivers and files 
Sonar Cube!
 2015-09-04 14:59:55 -06:00
Erik Johnson
28e07d5d06 Get rid of error in legacy git pillar when using branch mapping notation 
This doesn't fix the problem of the branch not being mapped to the
specified branch, and this code is not going to be maintained going
forward (in favor of the gitfs-backed git_pillar code), but this will at
least prevent the branch from failing to checkout.
 2015-09-04 15:19:58 -05:00
C. R. Oldham
d513acb3e5 Merge pull request #26914 from cro/salt-proxy-script 
Add salt-proxy script and manpage to setup.py so they will get installed.
 2015-09-04 12:43:34 -06:00