valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
58,140 Commits 24 Branches 182 Tags 341 MiB
8a2dd86c79
Commit Graph

58140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
fff709da81 Add a bunch more documentation for winrepo 2015-08-21 02:39:34 -05:00
Erik Johnson
b04bc228d0 Correct some inaccurate documentation, fix formatting 2015-08-21 02:38:12 -05:00
Erik Johnson
fb46a6cbda Rename ref anchor 2015-08-21 02:38:12 -05:00
Erik Johnson
bca44d8591 Config path not required anymore 
It hasn't been necessary to specify the config path for a couple years.
 2015-08-21 02:38:12 -05:00
Erik Johnson
c403f1e9c2 Remove genrepo function 
It is totally out of place here, and redundant with the presence of
salt/modules/win_repo.py.
 2015-08-21 02:38:12 -05:00
Erik Johnson
5aff1aeb9e Don't use os.rename() to overwrite file, causes errors on Windows 2015-08-21 02:38:12 -05:00
Erik Johnson
2819b85373 More meaningful error when repo cache not found 2015-08-21 02:38:12 -05:00
Erik Johnson
6f641893ee Fix minion-side winrepo_dir location to match master-side 2015-08-21 02:38:12 -05:00
Erik Johnson
8c254a40d8 Use imported winrepo runner functions to update winrepo 2015-08-21 02:38:12 -05:00
Erik Johnson
9f710ee787 Modify winrepo runner funcs to be able to be used in winrepo exec module 2015-08-21 02:38:11 -05:00
Justin Findlay
1757e980d8 Merge pull request #26539 from carlpett/patch-1 
Doc-fix: Escape backslash in domain\username
 2015-08-21 01:19:41 -06:00
Ageeleshwar Kandavelu
77bc8fcc55 ini lint and formatting fixes 2015-08-21 12:36:11 +05:30
Calle Pettersson
fd39928389 Doc-fix: Escape backslash in domain\username 
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
 2015-08-21 08:22:28 +02:00
Justin Findlay
aea76abdd5 Merge pull request #26524 from JensRantil/issue-18652 
Gracefully handle package comparison not in (-1, 0, 1)
 2015-08-20 23:42:50 -06:00
Justin Findlay
7da87fabf1 Merge pull request #26537 from jfindlay/note 
Merge #26481
 2015-08-20 23:37:24 -06:00
Justin Findlay
e7ebfd05b9 Merge pull request #26512 from trananhkma/develop 
fix raven
 2015-08-20 23:35:30 -06:00
Justin Findlay
2fee5708bb Merge pull request #26501 from terminalmage/git_pillar_docs 
Update git_pillar docs, add git.list_worktrees function
 2015-08-20 23:34:02 -06:00
Trần Tuấn Anh
c71a1ea491 remove raven.load() 2015-08-21 10:54:57 +07:00
Ageeleshwar Kandavelu
73bfbab452 Merge from upstream 
Merge branch 'develop' of github.com:saltstack/salt into develop
 2015-08-21 08:59:43 +05:30
Ageeleshwar Kandavelu
164c433395 format string indexing fix 2015-08-21 08:59:18 +05:30
Trần Tuấn Anh
af3ebd7e53 pep8 2015-08-21 09:23:34 +07:00
Trần Tuấn Anh
37d3d7eb99 options fix 2015-08-21 09:19:14 +07:00
Trần Tuấn Anh
ea3908debd handled options 2015-08-21 09:12:23 +07:00
Erik Johnson
cca92412d8 Use salt.utils.fopen() instead of open() 2015-08-20 18:51:44 -05:00
Justin Findlay
343e47f00c check exists and values in boto_elb listeners 
Fixes #26502.
 2015-08-20 17:40:23 -06:00
Justin Findlay
80110387c7 Merge pull request #26521 from terminalmage/issue15519 
Work around upstream git bug when cloning repo as root
 2015-08-20 17:32:16 -06:00
Justin Findlay
73183cbdb4 Merge pull request #26518 from krak3n/fix/25492 
Fix for #25492
 2015-08-20 17:28:34 -06:00
Justin Findlay
e2c43916d2 Merge pull request #26514 from evverx/unmask-runtime-masked-services 
Unmask a runtime masked services too
 2015-08-20 17:27:07 -06:00
Justin Findlay
51065b834f Merge pull request #26511 from rasathus/support-nested-upstart 
Adds support for nested upstart scripts in the form of subfolder/serv…
 2015-08-20 17:18:17 -06:00
Justin Findlay
662e723ae0 fixup note lint in file.replace state mod 2015-08-20 17:06:45 -06:00
Justin Findlay
dfd8c457bd Merge pull request #26529 from mnalt/fix_freebsdservice_module_for_missing_rcconf 
bugfix: fix service.enable for missing rc.conf
 2015-08-20 16:53:08 -06:00
Colton Myers
ff2d6c6045 Fix git test 2015-08-20 16:23:36 -06:00
Colton Myers
a3fc46da0b py3 compat 2015-08-20 16:23:32 -06:00
Mike Place
dd1bfa821b Merge pull request #26516 from techhat/spmloader2 
Move more path operations into SPM loader
 2015-08-20 16:15:20 -06:00
Jeremy Rosenbaum
9efbf4e5d4 Fix lint errors 
Running the `MinionBase` init method with `super` is literally the same as the
`self.opts = opts` statement that was in the init method for `SMinion` anyway
so if it makes flake8 happy, then sure.
 2015-08-20 14:52:14 -07:00
Mike Place
c6d8e34730 Merge pull request #26528 from zmalone/2015.5 
Fixing encrypt to instructions in the 2015.5 branch
 2015-08-20 15:49:06 -06:00
Joseph Hall
aead0ac432 Fix references 2015-08-20 15:47:34 -06:00
Mike Place
854491c9f3 Merge pull request #26533 from cachedout/fix_event_socket 
Fix too aggressive even init check
 2015-08-20 15:29:07 -06:00
Jenkins
b44ab40e26 Fix too aggressive even init check 2015-08-20 15:28:44 -06:00
Shane Lee
20fddf40a1 Merge pull request #26522 from cro/proxy_should_not_load 
Do not load package provider if its not a proxy
 2015-08-20 14:43:21 -06:00
Jeremy Rosenbaum
0eaccab724 use same master eval logic for Minion and SMinion 
This fixes https://github.com/saltstack/salt/issues/24354
There was inconsistent behavior between salt-minion (`Minion` under the hood)
and salt-call (`SMinion` under the hood) with regard to how the master was
determined from the minion config.  `SMinion` had its own hard-coded master
evaluation in its `__init__` method that was not congruent with documentation.
The "standard" master evaluation logic existed in `master_eval`, a method of
`Minion`.
This was resolved by moving `master_eval` into `MinionBase` (which `Minion`
inherits from) and making `SMinion` also subclass `MinionBase`, which
otherwise only consists of a couple of methods that `SMinion` won't access.
 2015-08-20 13:41:59 -07:00
Mike Place
6048b1351d Merge pull request #26531 from cachedout/event_test_fix 
Fix failing event tests and modify event init
 2015-08-20 14:38:36 -06:00
Colton Myers
d2fd7e24ad Merge pull request #20 from terminalmage/pr-26530 
Better sensitive data redaction in git execution module
 2015-08-20 14:28:36 -06:00
Erik Johnson
509f89f64f Better sensitive data redaction in git execution module 
This modifies the existing behavior such that re.IGNORECASE will be used
if we're on Python 2.7 or later. If not, then we try to match the regex
first on a lowercased version of the string, and if it matches, return
the substitution on a lowercased version of the string. If there is no
match, we just return the original string. This keeps us from
unnecessarily lowercasing the string.
 2015-08-20 15:26:45 -05:00
Jenkins
f5131c2b46 More indent 2015-08-20 13:57:36 -06:00
Jenkins
729ca11333 Indent error 2015-08-20 13:54:16 -06:00
Colton Myers
0aadf75d0d Force url to lowercase 2015-08-20 13:47:27 -06:00
Jenkins
52cde47aaf Fix failing event tests and modify event init 
There was a problem wherein two sockets would race to see which was connected first,
causing unit.utils.event_test.TestSaltEvent.test_event_multiple_clients to fail from
time to time. This gives a little breathing room to the second socket.

This also only does the pub connect if necessary on SaltEvent instantation.
 2015-08-20 13:41:07 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Martin Alt
a6b5007161 bugfix: fix service.enable for missing rc.conf 
The code assumed rc.conf to be existing and non-empty. Added a length
check to ensure it works even if rc.conf is missing, such as in a newly
created jail.
 2015-08-20 21:04:15 +02:00