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
85,580 Commits 24 Branches 182 Tags 341 MiB
0e42e8f9cc
Commit Graph

85580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
c6664291ce Merge pull request #43206 from rallytime/tkwilliams-boto-mentionbot 
Always notify tkwilliams when changes occur on boto files
 2017-08-28 13:26:17 -06:00
twangboy
b1788b1e5f Bring changes from #43228 to 2017.7 2017-08-28 12:35:46 -06:00
Mike Place
b4c689dff5 Merge pull request #43191 from viktorkrivak/fix-apache-config-multi-entity 
Fix apache.config with multiple statement
 2017-08-28 12:13:43 -06:00
Nathan Fish
bc2e02dc42 Merge branch 'add-nfs-state' of https://github.com/lordcirth/salt into add-nfs-state 2017-08-28 13:02:35 -05:00
Nathan Fish
0b25b73c60 nfs_export: add present() 2017-08-28 13:01:34 -05:00
Nathan Fish
0844f8b47b nfs_export: fix docstring syntax and add to index 2017-08-28 13:01:34 -05:00
Nathan Fish
b8f6d66f3c nfs_export: first draft of docs for present() 2017-08-28 13:01:34 -05:00
Nathan Fish
2ccb49b541 nfs_export.absent: add docstring 2017-08-28 13:01:34 -05:00
Nathan Fish
4bfa492b67 nfs_export.absent: return better Changes and support test=True 2017-08-28 13:01:34 -05:00
Nathan Fish
2c7bd81f66 nfs_export: first draft of absent() 2017-08-28 13:01:34 -05:00
Nathan Fish
cc3ada6474 nfs_export: third draft, with simple & complex modes 2017-08-28 13:01:34 -05:00
Nathan Fish
da76b9723a nfs_export: second draft of argument layout 2017-08-28 13:01:34 -05:00
Nathan Fish
7bb9851cd9 nfs_export: first draft of arguments 2017-08-28 13:01:34 -05:00
Mike Place
d685cfe4b3 Merge pull request #43214 from brejoc/fix_for_install_time_rh 
Checking install_time for None value
 2017-08-28 11:14:37 -06:00
Mike Place
d6d68d97ad Merge pull request #43218 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-28 11:10:53 -06:00
Mike Place
7ee18ee9f9 Merge pull request #43219 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 25
 2017-08-28 11:08:42 -06:00
Nicole Thomas
b90e59ede9 Merge pull request #43154 from lomeroe/bp-43116-2016.11 
Backport #43116 to 2016.11
 2017-08-28 12:40:40 -04:00
Nicole Thomas
6adc03e4b4 Merge pull request #43217 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-28 12:36:28 -04:00
m03
4516e13112 Leverage stringutils 2017-08-28 08:55:12 -07:00
rallytime
e44e15540d lint: remove unused import 2017-08-28 11:36:33 -04:00
lomeroe
b6c25978ff correcting bad format statement in search for policy to be disabled (fix 
for #43166)
verify that file exists before attempting to remove (fix for commits
from #39773)
 2017-08-28 10:13:10 -05:00
Viktor Krivak
c15bcbe1cc Merge remote-tracking branch 'upstream/2016.11' into fix-apache-config-multi-entity 2017-08-28 17:01:35 +02:00
lomeroe
324cfd8d1e correcting bad format statement in search for policy to be disabled (fix 
for #43166)
verify that file exists before attempting to remove (fix for commits
from #39773)
 2017-08-28 09:39:51 -05:00
rallytime
375b1faa92 Remove deprecation warnings for "env" 
Removal of these deprecation warnings has no behavioral effect, as
support for "env" instead of "saltenv" in these cases has already
been removed. Only the warning text will no longer display to users.
 2017-08-28 10:37:05 -04:00
lomeroe
8f593b0b02 verify that files exist before trying to remove them, win_file.remove 
raises an exception if the file does not exist
 2017-08-28 09:24:25 -05:00
rallytime
a8b786d0f2 Reduce the number of days an issue is stale by 25 2017-08-28 09:38:37 -04:00
rallytime
6fad40454a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/napalm.py
 2017-08-28 09:28:41 -04:00
rallytime
3911df2f4b Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-28 09:25:49 -04:00
Nicole Thomas
448086d2cb Merge pull request #43074 from twellspring/boto_elbv2_updates 
Boto elbv2 updates
 2017-08-28 09:24:45 -04:00
Nicole Thomas
df18a89836 Lint: Remove unused import 2017-08-28 09:21:52 -04:00
Nicole Thomas
5308c27f9f Merge pull request #43202 from garethgreenaway/42642_2016_11_augeas_module_revert_fix 
Reverting previous augeas module changes
 2017-08-28 09:14:27 -04:00
Nicole Thomas
9dbdb7c7d8 Merge pull request #43209 from eliezerlp/develop 
Remove references to SaltConf16 and generalize related README
 2017-08-28 09:09:10 -04:00
Jochen Breuer
bd76a870ce
Dunder vars are now defined via setup_loader_modules 2017-08-28 14:17:00 +02:00
Jochen Breuer
7071e3425c
Checking install_time for None value 
RedHat systems might in some cases return None as install_time,
which would cause a ValueError.

We are checking for None now. install_date and install_date_time
are being set to None in that case.
 2017-08-28 13:55:22 +02:00
m03
2ae911fa5e Improved list_repos functionality 2017-08-28 01:04:39 -07:00
m03
3c6f4d4a1a Add aptly execution module 2017-08-28 00:13:13 -07:00
Mapel88
25c8190e48 Fix pylint errors 
Fix pylint errors
 2017-08-28 10:12:56 +03:00
Mapel88
1eba8c4b8e Fix pylint errors 
Fix pylint errors
 2017-08-28 10:11:36 +03:00
Todd Wells
24445599a2 Merge branch 'develop' into boto_elbv2_updates 2017-08-27 14:36:10 -07:00
Eliezer Paiewonsky
f20dda890a Remove references to SaltConf16 and generalize related README 2017-08-27 17:33:40 -04:00
rallytime
453c3d7f20 Always notify tkwilliams when changes occur on boto files 2017-08-25 19:34:29 -04:00
Nicole Thomas
a563a9422a Merge pull request #43201 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-25 18:56:46 -04:00
Mike Place
cfde26562b Merge pull request #42991 from DarkKnightCZ/exec-code-all-fix 
Allow cmdmod.exec_code_all to utilize cmdmod.run_all parameters
 2017-08-25 15:25:31 -06:00
Mike Place
ce04ab4286 Merge pull request #42997 from twangboy/win_fix_test_module_names 
Fix `unit.test_test_module_names` for Windows
 2017-08-25 15:19:10 -06:00
Mike Place
c0279e491e Merge pull request #43006 from SuperPommeDeTerre/SuperPommeDeTerre-patch-#26995 
Try to fix #26995
 2017-08-25 15:16:06 -06:00
Mike Place
f16b7246e4 Merge pull request #43103 from aogier/43101-genesis-bootstrap 
genesis.bootstrap deboostrap fix
 2017-08-25 14:48:23 -06:00
Mike Place
9fd2eed5d0 Merge pull request #43148 from rallytime/fix-versionadded 
Fix versionadded reference for new eauth token modularity
 2017-08-25 14:26:05 -06:00
Nicole Thomas
4863771428 Merge pull request #42663 from StreetHawkInc/fix_git_tag_check 
Check remote tags before deciding to do a fetch #42329
 2017-08-25 16:14:31 -04:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04:00
Gareth J. Greenaway
ef7e93eb3f Reverting this change due to it breaking other uses. 2017-08-25 12:52:26 -07:00