valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,648 Commits 24 Branches 182 Tags 341 MiB
2b76029ded
Commit Graph

84648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions 
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
 2017-08-15 12:53:57 -05:00
Nicole Thomas
89cede9816 Merge pull request #42956 from Ch3LL/latest_develop 
[develop] Bump latest and previous versions
 2017-08-15 13:34:43 -04:00
Ch3LL
9c324d3d0c [develop] Bump latest and previous versions 2017-08-15 13:32:01 -04:00
Nicole Thomas
af0c8ffe36 Merge pull request #42934 from garethgreenaway/osquery_proper_error_reporting 
Fixes to error reporting for osquery module
 2017-08-15 10:20:56 -04:00
Nicole Thomas
d8b7afbbd1 Merge pull request #42928 from UtahDave/remove_stormpath2 
Remove stormpath2
 2017-08-15 10:09:23 -04:00
Mike Place
de88937491 Merge pull request #42691 from mitodl/develop 
Removed erroneous line causing duplicate creation of single function
 2017-08-14 22:36:17 -06:00
Mike Place
2017f36809 Merge pull request #42759 from garethgreenaway/42640_etcd_directory 
Additions to etcd state module
 2017-08-14 22:10:38 -06:00
Gareth J. Greenaway
57be3f64c1 Running osquery commands through cmd.run_all, when something goes wrong it still returns a retcode of 0. So look for something in stderr when errors occur instead. 2017-08-14 21:05:43 -07:00
Mike Place
db32d81d8a Merge pull request #42917 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-14 21:53:18 -06:00
Mike Place
ea847241e2 Merge pull request #42923 from rallytime/boto-notifications 
Always notify ryan-lane when changes occur on boto files
 2017-08-14 21:51:22 -06:00
Mike Place
d5c4071a17 Merge pull request #42924 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 15
 2017-08-14 21:48:36 -06:00
David Boucha
0ceb8009c7 remove Stormpath module, states and docs 2017-08-14 16:03:00 -06:00
David Boucha
ed7430d91b Add note about removal to release notes 2017-08-14 15:54:19 -06:00
David Boucha
02eb27004d Remove Stormpath auth. API shutting down. 
Per Stormpath's announcement, their API will be shutting down on
8/17/2017 at noon PST.

https://stormpath.com/oktaplusstormpath

Closes #42914
 2017-08-14 15:49:31 -06:00
rallytime
3136050177 Reduce the number of days an issue is stale by 15 2017-08-14 17:08:05 -04:00
Mike Place
61d39ffc3c Merge pull request #42802 from DarkKnightCZ/elastic-fix-instance 
Refactor instance obtaining in Elasticsearch module
 2017-08-14 13:55:56 -07:00
garethgreenaway
b13cd0d7c4 Merge branch 'develop' into 42640_etcd_directory 2017-08-14 13:41:18 -07:00
Mike Place
00ca6ad0b8 Merge pull request #42878 from vladislavPV/develop 
fix salt consul.get module crush on empty keys
 2017-08-14 13:40:31 -07:00
rallytime
182d642d05 Always notify ryan-lane when changes occur on boto files 2017-08-14 16:39:20 -04:00
Nicole Thomas
57ad6aebe9 Merge pull request #42760 from AFriemann/develop 
Catch TypeError thrown by m2crypto when parsing missing subjects in c…
 2017-08-14 14:58:05 -04:00
Nicole Thomas
31701bd34d Merge pull request #42787 from skizunov/develop5 
Add --skip-grains option to salt-run
 2017-08-14 14:51:15 -04:00
garethgreenaway
07395591dc Merge branch 'develop' into develop 2017-08-14 11:46:59 -07:00
Nicole Thomas
70eae35cc5 Merge branch 'develop' into develop 2017-08-14 14:45:47 -04:00
Nicole Thomas
0fee25be1c Merge pull request #42816 from sitepoint/rbenv_test_mode 
Implement rbenv state module test mode checks
 2017-08-14 14:33:08 -04:00
Nicole Thomas
ce941cf889 Merge pull request #42876 from isbm/isbm-salt-ssh-no-roster-devel 
Updates to Salt SSH
 2017-08-14 14:30:46 -04:00
garethgreenaway
a3b628a43b Merge branch 'develop' into 42640_etcd_directory 2017-08-14 11:30:03 -07:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04:00
Nicole Thomas
6a3279ea50 Merge pull request #42911 from gtmanfred/2017.7 
cloud driver isn't a provider
 2017-08-14 13:47:15 -04:00
Nicole Thomas
770f7d3ddc Merge pull request #42901 from aphor/zfs-fuse_support 
Add support for zfs-fuse to zfs.__virtual__()
 2017-08-14 12:26:34 -04:00
Daniel Wallace
99046b441f cloud driver isn't a provider 
This will not have a ':' in it at all.
 2017-08-14 10:26:21 -06:00
garethgreenaway
614f0357e9 Merge branch 'develop' into elastic-fix-instance 2017-08-14 08:48:38 -07:00
garethgreenaway
4456f7383d Merge pull request #42860 from skizunov/develop7 
hash_and_stat_file should return a 2-tuple
 2017-08-14 08:44:54 -07:00
garethgreenaway
9927fd315a Merge pull request #42830 from spenceation/panos/develop 
Panos/develop
 2017-08-14 08:40:49 -07:00
Nicole Thomas
1f6e6a6abb Whitespace fix 2017-08-14 10:21:32 -04:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-14 10:16:19 -04:00
Nicole Thomas
4b6fe2ee59 Merge pull request #42898 from mirceaulinic/patch-11 
Minor eos doc correction
 2017-08-14 09:42:20 -04:00
Bo Maryniuk
aa9d84ebba Lintfix W8470: possible resource leakage. 2017-08-14 15:04:11 +02:00
Bo Maryniuk
77cd3138c8 Move 'which' to the new path 2017-08-14 15:04:11 +02:00
Bo Maryniuk
1b8ea9e9d9 Add known hosts lister 2017-08-14 15:04:11 +02:00
Bo Maryniuk
716f84fd34 Add list hosts option 2017-08-14 15:04:11 +02:00
Bo Maryniuk
015f273c3b Do not expand target if list of hosts/IDs are passed 2017-08-14 15:04:11 +02:00
Bo Maryniuk
51cd42cc1b Refactor target expander 2017-08-14 15:04:11 +02:00
Bo Maryniuk
d96c771a88 Fix PEP8: length of the string 2017-08-14 15:04:11 +02:00
Bo Maryniuk
a3907c8511 Refactor roster update process 2017-08-14 15:04:11 +02:00
Bo Maryniuk
b93d034789 Bugfix: use set to self options, instead of their copies from parameters 2017-08-14 15:04:11 +02:00
Bo Maryniuk
b306bca07a Expand target if it is known or not FQDN 2017-08-14 15:04:11 +02:00
Bo Maryniuk
f839d5ce2d Prevent confusion if roster and target are the same 2017-08-14 15:03:27 +02:00
Bo Maryniuk
c7d0fddd28 Add network utility to recognize if any entity is a reachable/resolvable host 2017-08-14 15:03:27 +02:00
Bo Maryniuk
ed8a3bb92f Add option to skip roster, in case auto-add is not needed 2017-08-14 15:03:27 +02:00
Bo Maryniuk
010d4f2c9b Add to the flat nearby writable roster the current called data 2017-08-14 15:03:27 +02:00