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
77,860 Commits 24 Branches 182 Tags 341 MiB
3a0b02f3ae
Commit Graph

77860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
3a0b02f3ae Merge pull request #43228 from twangboy/win_fix_pkg.install 
Win fix pkg.install
 2017-08-30 10:26:21 -04:00
twangboy
13dfabb1ce Fix regex statement, add . 2017-08-29 13:27:18 -06:00
twangboy
31ff69f0ad Add underscore to regex search 2017-08-29 11:43:59 -06:00
twangboy
3cf2b6575c Fix spelling 2017-08-29 11:43:59 -06:00
twangboy
ed030a35a5 Use regex to detect salt-minion install 2017-08-29 11:43:59 -06:00
twangboy
e5daff495a Fix pkg.install 
I jacked this up previously
convert cmd to a list
use cmd.extend
 2017-08-29 11:43:59 -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
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
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
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
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
Mike Place
f16b7246e4 Merge pull request #43103 from aogier/43101-genesis-bootstrap 
genesis.bootstrap deboostrap fix
 2017-08-25 14:48:23 -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
Gareth J. Greenaway
ef7e93eb3f Reverting this change due to it breaking other uses. 2017-08-25 12:52:26 -07: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
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
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
Mike Place
12e9507b9e Merge pull request #43179 from terminalmage/old-deprecation 
Fix missed deprecation
 2017-08-24 16:52:33 -06:00
Erik Johnson
2640833400 git.detached: Fix traceback when rev is a SHA and is not present locally 
This catches the (expected) CommandExecutionError when git.describe is
run on a commit that doesn't exist.

This also renames the remote_ref_type variable to remote_rev_type. This
change was made for the 2017.7 branch, but this fix is being applied to
2016.11, so by making the rename here as well we will avoid a potential
bug from creeping in on a merge-forward.
 2017-08-24 16:56:18 -05:00
Erik Johnson
3adf8ad04b Fix missed deprecation 
This removes an argument that was slated for deprecation in the Hydrogen
release.
 2017-08-24 15:26:55 -05:00
garethgreenaway
b595440d90 Merge pull request #43171 from terminalmage/salt-utils-warning 
Add warning about adding new functions to salt/utils/__init__.py
 2017-08-24 12:10:22 -07:00
garethgreenaway
4f273cac4f Merge pull request #43173 from Ch3LL/add_branch_docs 
Add New Release Branch Strategy to Contribution Docs
 2017-08-24 12:04:55 -07:00
Ch3LL
1b24244bd3 Add New Release Branch Strategy to Contribution Docs 2017-08-24 12:51:00 -04:00
Erik Johnson
7b5943a31a Add warning about adding new functions to salt/utils/__init__.py 
Since we are breaking this up, we don't want new functions added here.
 2017-08-24 11:04:31 -05:00
Alessandro -oggei- Ogier
db94f3bb1c better formatting 2017-08-24 15:07:08 +02:00
Alessandro -oggei- Ogier
e5cc667762 tests: fix a leftover and simplify some parts 2017-08-24 15:04:37 +02:00
Alessandro -oggei- Ogier
13e5997457 lint 2017-08-24 12:49:39 +02:00
Alessandro -oggei- Ogier
216ced69e5 allow comma-separated pkgs lists, quote args, test deb behaviour 2017-08-24 12:00:36 +02:00
Alessandro -oggei- Ogier
d8612ae006 fix debootstrap and enhance packages selection/deletion via cmdline 2017-08-24 10:26:43 +02:00
Mike Place
669b376abf Merge pull request #43151 from ushmodin/2016.11 
state.sls hangs on file.recurse with clean: True on windows
 2017-08-23 11:25:32 -06:00
lomeroe
acc3d7ac82 correct fopen calls from salt.utils for 2016.11's utils function 2017-08-23 11:09:12 -05:00
lomeroe
2da1cdd109 lint fix 2017-08-23 11:02:53 -05:00
lomeroe
61bd12c0de track xml namespace to ensure policies w/duplicate IDs or Names do not 
conflict
 2017-08-23 11:02:53 -05:00
lomeroe
f232bed9f9 add additional checks for ADM policies that have the same ADMX policy ID 
(#42279)
 2017-08-23 10:56:20 -05:00
Ushmodin Nikolay
c5841e2ade state.sls hangs on file.recurse with clean: True on windows 2017-08-23 22:43:04 +07:00
Mike Place
ae9d2b7985 Merge pull request #42986 from renner/systemd-notify 
Notify systemd synchronously (via NOTIFY_SOCKET)
 2017-08-22 10:52:56 -06:00
Mike Place
b420fbe618 Merge pull request #43037 from mcarlton00/fix-bhyve-grains 
Issue #43036 Bhyve virtual grain in Linux VMs
 2017-08-22 10:43:40 -06:00
Mike Place
0a86f2d884 Merge pull request #43100 from vutny/doc-add-missing-utils-ext 
[DOCS] Add missing `utils` sub-dir listed for `extension_modules`
 2017-08-22 09:40:08 -06:00
Johannes Renner
79c53f3f81 Fallback to systemd_notify_call() in case of socket.error 2017-08-22 15:57:51 +02:00
Johannes Renner
f1765472dd Notify systemd synchronously (via NOTIFY_SOCKET) 
Forking the systemd-notify command is known to be unreliable at least
with older versions of the kernel and/or systemd. When systemd receives
the notification the systemd-notify process may have already exited
causing an error in the logs while waiting for a (90 seconds) timeout.

This patch instead notifies the systemd NOTIFY_SOCKET synchronously in
case the systemd.daemon python library is not available.
 2017-08-22 13:42:01 +02:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
Mike Place
e2bf2f448e Merge pull request #42985 from DSRCorporation/bugs/15171_recursion_limit 
Properly handle `prereq` having lost requisites.
 2017-08-21 16:49:38 -06:00
Mike Place
e51333306c Merge pull request #43092 from mitodl/2016.11 
Fixed issue with silently passing all tests in Testinfra module
 2017-08-21 14:22:07 -06:00
Mike Place
77a443ce8e Merge pull request #43060 from twangboy/osx_update_pkg_scripts 
Osx update pkg scripts
 2017-08-21 14:06:11 -06:00
Tobias Macey
d4b113acdf
Fixed issue with silently passing all tests in Testinfra module 
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
 2017-08-21 13:34:43 -04:00
Nicole Thomas
1b1b6da803 Merge pull request #43064 from terminalmage/issue42869 
Fix race condition in git.latest
 2017-08-21 10:29:52 -04:00