valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,477 Commits 24 Branches 182 Tags 341 MiB
b9b5181046
Commit Graph

85477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Place
8d4cb0bfe5 Merge pull request #43181 from rallytime/deprecate_authorize_class 
Deprecate Authorize class and any_auth function
 2017-08-25 13:30:38 -06:00
Mike Place
4193e7f0a2 Merge pull request #43199 from corywright/disk-format-alias 
Add `disk.format` alias for `disk.format_`
 2017-08-25 13:21:07 -06:00
Mike Place
5471f9fe0c Merge pull request #43196 from gtmanfred/2016.11 
Pin request install to version for npm tests
 2017-08-25 12:43:05 -06:00
Mike Place
b6c5314fe9 Merge pull request #43184 from terminalmage/issue43162 
docker.compare_container: Perform boolean comparison when one side's value is null/None
 2017-08-25 12:42:10 -06:00
lomeroe
33a30bac06 correcting bad format statement in search for policy to be disabled 2017-08-25 12:31:12 -05:00
Cory Wright
f00d3a9ddc Add disk.format alias for disk.format_ 2017-08-25 13:29:40 -04:00
Daniel Wallace
ccd2241777 Pin request install to version 
This fails on centos 6 because its node is too old to support the version of
hawk bumped here https://github.com/request/request/pull/2751, we can still
test the functionality.  This will pull from github, and install a specific tag
version, and we still do the uninstall using the github path.

This should be more stable.
 2017-08-25 10:23:35 -06:00
garethgreenaway
0b361629b4 Merge branch 'develop' into adding_custom_beacons 2017-08-25 09:11:47 -07:00
Jérémie Langlade
30dd6f5d12 Merge remote-tracking branch 'upstream/2017.7' into SuperPommeDeTerre-patch-#26995 2017-08-25 16:45:24 +02:00
Nicole Thomas
11b97d588c Merge pull request #43072 from darcoli/pillarenv_from_saltenv_states 
Consider saltenv from kwargs with pillarenv_from_saltenv
 2017-08-25 10:13:08 -04:00
Nicole Thomas
4f90c6383e Merge pull request #43183 from basepi/fixup 
Add basepi to userBlacklist for mention bot
 2017-08-25 10:05:52 -04:00
Nicole Thomas
ace2715c60 Merge pull request #43178 from terminalmage/issue43143 
git.detached: Fix traceback when rev is a SHA and is not present locally
 2017-08-25 09:58:36 -04:00
Viktor Krivak
4164047951 Fix apache.config with multiple statement 
At this moment when you post more than one statement in config only last
is used. Also file is rewrited multiple times until last statement is
written.
Example:
salt '*' apache.config /etc/httpd/conf.d/ports.conf config="[{'Listen': '8080'}, {'Proxy': "Something"}]"
Ends only with
   Proxy Something
and ignore Listen 8080,
This patch fix this issue.
 2017-08-25 15:56:40 +02:00
Erik Johnson
7279f98e92 docker_image states: Handle Hub images prefixed with "docker.io/" 
On some platforms, for reason which I do not yet grok, images pulled
from the Hub are prefixed with "docker.io/". This causes the
docker_image states to fail unless the user manually adds "docker.io/"
before the image name.

This commit adds a new function called "docker.resolve_tag" which
disambiguates this variance and allows images to be specified without
the "docker.io/" prefix.

Resolves #42935.
 2017-08-25 00:06:28 -05:00
garethgreenaway
d3cb78e74e Merge branch 'develop' into adding_custom_beacons 2017-08-24 17:25:13 -07:00
Mike Place
3d5a630c59 Merge pull request #43161 from bodhi-space/infra5461 
INFRA-5461 - fix a couple of smallish bugs in boto_elb exec and state modules
 2017-08-24 17:06:45 -06:00
Mike Place
688125bb4f Merge pull request #43165 from cloudflare/fix-napalm-ret 
Improve napalm state output in debug mode
 2017-08-24 17:05:37 -06:00
Mike Place
949f83a05d Merge pull request #43177 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-24 17:04:07 -06:00
Mike Place
12e9507b9e Merge pull request #43179 from terminalmage/old-deprecation 
Fix missed deprecation
 2017-08-24 16:52:33 -06:00